diff --git a/NOTICES.txt b/NOTICES.txt index 54597bab..2a9c4e48 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -3460,7 +3460,7 @@ https://github.com/svaarala/duktape/blob/master/LICENSE.txt ------------------------------------ -Package path: ..\..\..\3rdParty\packages\Crashpad-0.8.0-rev2-windows\Crashpad\share\crashpad\copyright +Package path: ..\..\..\3rdParty\packages\Crashpad-0.8.0-rev3-windows\Crashpad\share\crashpad\copyright License: diff --git a/SPDX-Licenses.csv b/SPDX-Licenses.csv index 04f6fa26..31ec9b68 100644 --- a/SPDX-Licenses.csv +++ b/SPDX-Licenses.csv @@ -10,7 +10,7 @@ azslc-1.7.34-rev1-windows,https://github.com/o3de/o3de-azslc,CUSTOM,azslc/LICENS Blast-v1.1.7_rc2-9-geb169fe-rev2-windows,https://github.com/NVIDIAGameWorks/Blast,custom,Blast/license.txt cityhash-1.1-multiplatform,http://code.google.com/p/cityhash/,MIT,cityhash/COPYING civetweb-1.8-rev1-windows,https://github.com/civetweb/civetweb,custom,civetweb/LICENSE.md -Crashpad-0.8.0-rev2-windows,https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md,Apache-2.0,Crashpad/share/crashpad/copyright +Crashpad-0.8.0-rev3-windows,https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md,Apache-2.0,Crashpad/share/crashpad/copyright d3dx12-headers-rev1-windows,https://github.com/microsoft/DirectX-Headers,MIT License,d3dx12/license.txt DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows,https://github.com/aws-lumberyard/DirectXShaderCompiler,NCSA,DirectXShaderCompilerDxc/LICENSE.TXT expat-2.4.2-rev1-windows,https://libexpat.github.io/,MIT,expat/COPYING diff --git a/SPDX-Licenses.json b/SPDX-Licenses.json index 1f60c7c1..9420ed48 100644 --- a/SPDX-Licenses.json +++ b/SPDX-Licenses.json @@ -66,7 +66,7 @@ "LicenseFile": "civetweb/LICENSE.md" }, { - "PackageName": "Crashpad-0.8.0-rev2-windows", + "PackageName": "Crashpad-0.8.0-rev3-windows", "URL": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", "License": "Apache-2.0", "LicenseFile": "Crashpad/share/crashpad/copyright" diff --git a/package-system/AWSNativeSDK/README.md b/package-system/AWSNativeSDK/README.md index 509af16b..d7c64954 100644 --- a/package-system/AWSNativeSDK/README.md +++ b/package-system/AWSNativeSDK/README.md @@ -88,7 +88,7 @@ As current version is `1.9.50-rev2`, bump it to `1.9.50-rev3` for example + "AWSNativeSDK-1.9.50-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean", "AWSNativeSDK-1.9.50-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean", "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows", - "Crashpad-0.8.0-rev2-windows": "package-system/Crashpad/build_package_image.py", + "Crashpad-0.8.0-rev3-windows": "package-system/Crashpad/build_package_image.py", @@ -51,7 +51,7 @@ "build_from_folder": { "astc-encoder-3.2-rev2-windows" : "package-system/astc-encoder-windows", @@ -97,7 +97,7 @@ As current version is `1.9.50-rev2`, bump it to `1.9.50-rev3` for example + "AWSNativeSDK-1.9.50-rev3-windows": "package-system/AWSNativeSDK-windows", "AWSNativeSDK-1.9.50-rev1-android": "package-system/AWSNativeSDK-android", "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows", - "Crashpad-0.8.0-rev2-windows" : "package-system/Crashpad-windows", + "Crashpad-0.8.0-rev3-windows" : "package-system/Crashpad-windows", ``` ### 5. Follow 3p-package-scripts runbook to build and distribute package diff --git a/package-system/Crashpad/build_package_image.py b/package-system/Crashpad/build_package_image.py index 1a4d1fb8..0fc5d0a5 100644 --- a/package-system/Crashpad/build_package_image.py +++ b/package-system/Crashpad/build_package_image.py @@ -98,7 +98,7 @@ def main(): { 'dir': output_dir, 'settings': { - 'PackageName': f'Crashpad-0.8.0-rev2-{args.platform_name}', + 'PackageName': f'Crashpad-0.8.0-rev3-{args.platform_name}', 'URL': 'https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md', 'License': 'Apache-2.0', 'LicenseFile': f'{builder.packageName}/share/{builder.portName}/copyright' diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index a70ad78b..ea93f75d 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -12,7 +12,7 @@ "AWSNativeSDK-1.11.361-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean", "AWSNativeSDK-1.11.361-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean", "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows", - "Crashpad-0.8.0-rev2-windows": "package-system/Crashpad/build_package_image.py --platform-name windows", + "Crashpad-0.8.0-rev3-windows": "package-system/Crashpad/build_package_image.py --platform-name windows", "DirectXShaderCompilerDxc-1.8.2505.1-o3de-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean", "expat-2.4.2-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Android --package-root ../../package-system/expat/temp --clean", "expat-2.4.2-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Windows --package-root ../../package-system/expat/temp --clean", @@ -76,7 +76,7 @@ "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows", "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform", "civetweb-1.8-rev1-windows": "package-system/civetweb-windows", - "Crashpad-0.8.0-rev2-windows": "package-system/Crashpad-windows", + "Crashpad-0.8.0-rev3-windows": "package-system/Crashpad-windows", "DirectXShaderCompilerDxc-1.8.2505.1-o3de-rev3-windows": "package-system/DirectXShaderCompilerDxc-windows", "d3dx12-headers-rev1-windows": "package-system/d3dx12-windows", "expat-2.4.2-rev2-android": "package-system/expat/temp/expat-android",