From c744591724e3a340c0d357feba30998841cc4ede Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:23:57 -0400 Subject: [PATCH 01/10] Update DirectXShaderCompiler to version 1.7.2308-o3de-rev2 -Add support for specialization constants Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- .../FindDirectXShaderCompilerDxc.cmake.Windows | 1 + package-system/DirectXShaderCompiler/build_config.json | 4 ++-- .../DirectXShaderCompiler/install_dxc_windows.cmd | 7 +++++++ package_build_list_host_darwin.json | 4 ++-- package_build_list_host_linux-aarch64.json | 4 ++-- package_build_list_host_linux.json | 4 ++-- package_build_list_host_windows.json | 4 ++-- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows index cd2c0abe..696a25a3 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows @@ -19,6 +19,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/Release/dxc.exe + ${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe ${${MY_NAME}_BINARY_DIR}/Release/dxil.dll ${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/build_config.json b/package-system/DirectXShaderCompiler/build_config.json index d8b72380..d7ed308d 100644 --- a/package-system/DirectXShaderCompiler/build_config.json +++ b/package-system/DirectXShaderCompiler/build_config.json @@ -1,8 +1,8 @@ { "git_url":"https://github.com/o3de/DirectXShaderCompiler.git", - "git_tag":"release-1.7.2308-o3de", + "git_tag":"release-1.7.2308-o3de.2", "package_name":"DirectXShaderCompilerDxc", - "package_version":"1.7.2308-o3de-rev1", + "package_version":"1.7.2308-o3de-rev2", "package_url":"https://github.com/o3de/DirectXShaderCompiler", "package_license":"NCSA", "package_license_file":"LICENSE.TXT", diff --git a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd index 61a27766..7824f1b2 100644 --- a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd @@ -34,6 +34,13 @@ IF %ERRORLEVEL% NEQ 0 ( exit /b 1 ) +echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\ +copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\ +IF %ERRORLEVEL% NEQ 0 ( + ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe + exit /b 1 +) + ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\ copy /Y %BLD_PATH%\Release\bin\dxcompiler.dll %BIN_PATH%\\Release\ IF %ERRORLEVEL% NEQ 0 ( diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 83d0705c..c979de2d 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -38,7 +38,7 @@ "SQLite-3.37.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/sqlite --platform-name Mac --package-root ../../package-system --clean", "squish-ccr-deb557d-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean", "astc-encoder-3.2-rev5-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean", "azslc-1.8.19-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Mac --package-root ../../package-system/azslc/temp --clean", "python-3.10.13-rev1-darwin": "package-system/python/build_package_image.py", "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1", @@ -95,7 +95,7 @@ "SPIRVCross-1.3.275.0-rev1-mac": "package-system/SPIRVCross-mac", "squish-ccr-deb557d-rev1-mac": "package-system/squish-ccr-mac", "astc-encoder-3.2-rev5-mac": "package-system/astc-encoder-mac", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-mac": "package-system/DirectXShaderCompilerDxc-mac", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-mac": "package-system/DirectXShaderCompilerDxc-mac", "azslc-1.8.19-rev1-mac": "package-system/azslc/temp/azslc-mac", "SQLite-3.37.2-rev2-mac": "package-system/SQLite-mac", "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index c6ad3a34..94b0677b 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -11,7 +11,7 @@ "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", "azslc-1.8.19-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux-aarch64 --clean", "cityhash-1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux-aarch64 --clean", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean", "expat-2.4.2-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux-aarch64 --clean", "freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean", "googlebenchmark-1.7.0-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux-aarch64 --clean", @@ -52,7 +52,7 @@ "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", "azslc-1.8.19-rev1-linux-aarch64": "package-system/azslc/temp/azslc-linux-aarch64", "cityhash-1.1-rev1-linux-aarch64": "package-system/cityhash/temp/cityhash-linux-aarch64", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64", "expat-2.4.2-rev2-linux-aarch64": "package-system/expat/temp/expat-linux-aarch64", "freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64", "googlebenchmark-1.7.0-rev1-linux-aarch64": "package-system/googlebenchmark/temp/googlebenchmark-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 97627e4e..62e7a1e3 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -39,7 +39,7 @@ "squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --clean", "squish-ccr-deb557d-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux-aarch64 --clean", "astc-encoder-3.2-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux --package-root ../../package-system --clean", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean", "azslc-1.8.19-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system/azslc/temp --clean", "tiff-4.2.0.15-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean", "python-3.10.13-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/python --platform-name Linux --clean", @@ -81,7 +81,7 @@ "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr/temp/squish-ccr-linux", "squish-ccr-deb557d-rev1-linux-aarch64": "package-system/squish-ccr/temp/squish-ccr-linux-aarch64", "astc-encoder-3.2-rev3-linux": "package-system/astc-encoder-linux", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux": "package-system/DirectXShaderCompilerDxc-linux", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-linux": "package-system/DirectXShaderCompilerDxc-linux", "azslc-1.8.19-rev1-linux": "package-system/azslc/temp/azslc-linux", "tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux", "python-3.10.13-rev2-linux": "package-system/python/temp/python-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 164d465e..24d9b8c7 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -13,7 +13,7 @@ "AWSNativeSDK-1.11.288-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-rev1-windows": "package-system/Crashpad/build_package_image.py", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-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", "freetype-2.11.1-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system/freetype/temp --clean", @@ -77,7 +77,7 @@ "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform", "civetweb-1.8-rev1-windows": "package-system/civetweb-windows", "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad-windows", - "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "package-system/DirectXShaderCompilerDxc-windows", + "DirectXShaderCompilerDxc-1.7.2308-o3de-rev2-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", "expat-2.4.2-rev2-windows": "package-system/expat/temp/expat-windows", From 094cfee59aae1fe78eca4bc6b67ef826aae5da83 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:12:00 -0400 Subject: [PATCH 02/10] Add DXSC to DirectXShaderCompiler Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- .../FindDirectXShaderCompilerDxc.cmake.Linux | 1 + .../DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac | 1 + 2 files changed, 2 insertions(+) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux index 95b65add..cd9c8990 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Linux @@ -21,6 +21,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_BIN_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/dxc ${${MY_NAME}_BINARY_DIR}/dxc-3.7 + ${${MY_NAME}_BINARY_DIR}/dxsc ) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY "${output_subfolder}/bin" FILES ${${MY_NAME}_BIN_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac index 3a310e27..685f33a5 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Mac @@ -20,6 +20,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_BIN_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/dxc ${${MY_NAME}_BINARY_DIR}/dxc-3.7 + ${${MY_NAME}_BINARY_DIR}/dxsc ) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY "${output_subfolder}/bin" FILES ${${MY_NAME}_BIN_RUNTIME_DEPENDENCIES}) From fb7cf13a6090a2848bc9e92b04faa662012151f4 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:12:41 -0400 Subject: [PATCH 03/10] Update to vs2022 for DirectXShaderCompiler win Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- package-system/DirectXShaderCompiler/build_dxc_windows.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd index 2d90fc47..c1e0322a 100755 --- a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd @@ -29,9 +29,9 @@ IF %ERRORLEVEL% NEQ 0 ( ) REM Run the build for Release -call utils\hct\hctbuild.cmd -rel -x64 -vs2019 -spirv +call utils\hct\hctbuild.cmd -rel -x64 -vs2022 -spirv IF %ERRORLEVEL% NEQ 0 ( - ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2019 Failed" + ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2022 Failed" exit /b 1 ) From 953da2c20e181bea3830d31a59389404772acddf Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:02:58 -0400 Subject: [PATCH 04/10] Revert to previous tag to test asset failure Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- package-system/DirectXShaderCompiler/build_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-system/DirectXShaderCompiler/build_config.json b/package-system/DirectXShaderCompiler/build_config.json index d7ed308d..b81c22b0 100644 --- a/package-system/DirectXShaderCompiler/build_config.json +++ b/package-system/DirectXShaderCompiler/build_config.json @@ -1,6 +1,6 @@ { "git_url":"https://github.com/o3de/DirectXShaderCompiler.git", - "git_tag":"release-1.7.2308-o3de.2", + "git_tag":"release-1.7.2308-o3de", "package_name":"DirectXShaderCompilerDxc", "package_version":"1.7.2308-o3de-rev2", "package_url":"https://github.com/o3de/DirectXShaderCompiler", From a13f4672668f91d622413a440e3064f49caf7029 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:20:36 -0400 Subject: [PATCH 05/10] Testing old package Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- .../FindDirectXShaderCompilerDxc.cmake.Windows | 1 - package-system/DirectXShaderCompiler/install_dxc_windows.cmd | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows index 696a25a3..cd2c0abe 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows @@ -19,7 +19,6 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/Release/dxc.exe - ${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe ${${MY_NAME}_BINARY_DIR}/Release/dxil.dll ${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd index 7824f1b2..ba502398 100644 --- a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd @@ -38,7 +38,7 @@ echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\ copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\ IF %ERRORLEVEL% NEQ 0 ( ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe - exit /b 1 + REM exit /b 1 ) ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\ From 2ec7da41a8faa132a646eb824faff34361d775dc Mon Sep 17 00:00:00 2001 From: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com> Date: Mon, 8 Jul 2024 09:32:23 -0700 Subject: [PATCH 06/10] AWS SDK Update to Pass Apple AppStore Submission (#256) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Upgrading the AWS SDK 11.361 with AWS_APPSTORE_SAFE flag - 1.11.361 also contains this fix: [Visual Studio 2022 STD::Allocator Warning Treated as Error · Issue #3001 · aws/aws-sdk-cpp (github.com)](https://github.com/aws/aws-sdk-cpp/issues/3001) - 1.11.361 also contains this fix: [1.11.337+ Android cURL Build No Longer Compiles · Issue #3014 · aws/aws-sdk-cpp (github.com)](https://github.com/aws/aws-sdk-cpp/issues/3014) Tested by 1) Grep'ing libraries for non-public api "CryptorGCM" before and after enabling AWS_APPSTORE_SAFE flag 2) Help from external developer re-submitting to Apple AppStore and passing Fixes https://github.com/o3de/o3de/issues/18029 --------- Signed-off-by: Gene Walters Signed-off-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com> Signed-off-by: AMZN-Gene --- .../AWSNativeSDK/build_AWSNativeSDK_ios.sh | 1 + package-system/AWSNativeSDK/build_config.json | 18 +++++++++--------- package_build_list_host_darwin.json | 8 ++++---- package_build_list_host_linux-aarch64.json | 4 ++-- package_build_list_host_linux.json | 8 ++++---- package_build_list_host_windows.json | 8 ++++---- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh b/package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh index c7604b5f..8ef043a1 100755 --- a/package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh +++ b/package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh @@ -16,6 +16,7 @@ configure_and_build_static() { build_type=$1 echo "CMake Configure $build_type Static" + CFLAGS="-DAWS_APPSTORE_SAFE" \ CXXFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" \ cmake -S "$src_path" -B "$bld_path/${build_type}_Static" \ -DTARGET_ARCH=APPLE \ diff --git a/package-system/AWSNativeSDK/build_config.json b/package-system/AWSNativeSDK/build_config.json index a74f5436..0badb4df 100644 --- a/package-system/AWSNativeSDK/build_config.json +++ b/package-system/AWSNativeSDK/build_config.json @@ -1,8 +1,8 @@ { "git_url":"https://github.com/aws/aws-sdk-cpp.git", - "git_tag":"1.11.288", + "git_tag":"1.11.361", "package_name":"AWSNativeSDK", - "package_version":"1.11.288-rev1", + "package_version":"1.11.361-rev1", "package_url":"https://github.com/aws/aws-sdk-cpp", "package_license":"Apache-2.0", "package_license_file":"LICENSE", @@ -12,7 +12,7 @@ "Platforms":{ "Windows":{ "Windows":{ - "package_version":"1.11.288-rev1", + "package_version":"1.11.361-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.Windows", "custom_build_cmd": [ "build_AWSNativeSDK_windows.cmd" @@ -22,7 +22,7 @@ ] }, "Android":{ - "package_version":"1.11.288-rev2", + "package_version":"1.11.361-rev1", "depends_on_packages": [ [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ] ], @@ -47,7 +47,7 @@ ] }, "iOS":{ - "package_version":"1.11.288-rev2", + "package_version":"1.11.361-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.iOS", "custom_build_cmd": [ "./build_AWSNativeSDK_ios.sh" @@ -63,11 +63,11 @@ [ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ], [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ] ], - "package_version":"1.11.288-rev1", + "package_version":"1.11.361-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.Linux", "custom_build_cmd": [ "./build-linux.sh", - "aws_native_sdk_1_11_288", + "aws_native_sdk_1_11_361", "20.04", "curl-7_68_0", "x86_64" @@ -81,11 +81,11 @@ [ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ], [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ] ], - "package_version":"1.11.288-rev1", + "package_version":"1.11.361-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.Linux", "custom_build_cmd": [ "./build-linux.sh", - "aws_native_sdk_1_11_288", + "aws_native_sdk_1_11_361", "20.04", "curl-7_68_0", "aarch64" diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index 83d0705c..b6e3e53a 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -5,8 +5,8 @@ "comment4" : "Note: Build from source occurs before build_from_folder", "build_from_source": { "assimp-5.2.5-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.288-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.288-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean", + "AWSNativeSDK-1.11.361-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean", + "AWSNativeSDK-1.11.361-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean", "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean", "Lua-5.4.4-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system/Lua/temp --clean", "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean", @@ -56,8 +56,8 @@ }, "build_from_folder": { "assimp-5.2.5-rev1-mac": "package-system/assimp-mac", - "AWSNativeSDK-1.11.288-rev1-mac": "package-system/AWSNativeSDK-mac", - "AWSNativeSDK-1.11.288-rev2-ios": "package-system/AWSNativeSDK-ios", + "AWSNativeSDK-1.11.361-rev1-mac": "package-system/AWSNativeSDK-mac", + "AWSNativeSDK-1.11.361-rev1-ios": "package-system/AWSNativeSDK-ios", "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac", "Lua-5.4.4-rev1-mac": "package-system/Lua/temp/Lua-mac", "Lua-5.4.4-rev1-ios": "package-system/Lua/temp/Lua-ios", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index c6ad3a34..73498757 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -8,7 +8,7 @@ "astc-encoder-3.2-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux-aarch64 --clean", "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean", - "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", + "AWSNativeSDK-1.11.361-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", "azslc-1.8.19-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux-aarch64 --clean", "cityhash-1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux-aarch64 --clean", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean", @@ -49,7 +49,7 @@ "astc-encoder-3.2-rev3-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64", "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "package-system/AwsIotDeviceSdkCpp/temp/AwsIotDeviceSdkCpp-linux-aarch64", - "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", + "AWSNativeSDK-1.11.361-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", "azslc-1.8.19-rev1-linux-aarch64": "package-system/azslc/temp/azslc-linux-aarch64", "cityhash-1.1-rev1-linux-aarch64": "package-system/cityhash/temp/cityhash-linux-aarch64", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index 97627e4e..bc08a6ae 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -7,8 +7,8 @@ "assimp-5.2.5-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean", "AWSGameLiftServerSDK-5.1.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux --clean", "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean", - "AWSNativeSDK-1.11.288-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean", - "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", + "AWSNativeSDK-1.11.361-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean", + "AWSNativeSDK-1.11.361-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", "cityhash-1.1-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux --clean", "Lua-5.4.4-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system/Lua/temp --clean", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean", @@ -55,8 +55,8 @@ "assimp-5.2.5-rev1-linux": "package-system/assimp-linux", "AWSGameLiftServerSDK-5.1.2-rev1-linux": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux", "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64", - "AWSNativeSDK-1.11.288-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux", - "AWSNativeSDK-1.11.288-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", + "AWSNativeSDK-1.11.361-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux", + "AWSNativeSDK-1.11.361-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", "cityhash-1.1-rev1-linux": "package-system/cityhash/temp/cityhash-linux", "Lua-5.4.4-rev1-linux": "package-system/Lua/temp/Lua-linux", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 164d465e..5911c9dc 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -9,8 +9,8 @@ "azslc-1.8.19-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system/azslc/temp --clean", "AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name windows", "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.288-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.288-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean", + "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-rev1-windows": "package-system/Crashpad/build_package_image.py", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean", @@ -71,8 +71,8 @@ "azslc-1.8.19-rev1-windows": "package-system/azslc/temp/azslc-windows", "AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK-windows", "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows", - "AWSNativeSDK-1.11.288-rev2-android": "package-system/AWSNativeSDK-android", - "AWSNativeSDK-1.11.288-rev1-windows": "package-system/AWSNativeSDK-windows", + "AWSNativeSDK-1.11.361-rev1-android": "package-system/AWSNativeSDK-android", + "AWSNativeSDK-1.11.361-rev1-windows": "package-system/AWSNativeSDK-windows", "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", From f0d8925eed8d5fbbe122cbab5936ef9d6d99aa99 Mon Sep 17 00:00:00 2001 From: Mike Chang Date: Sat, 13 Jul 2024 11:29:04 -0700 Subject: [PATCH 07/10] Add 3p build workflow for special cases (#259) Adds a section in the 3p build for certain cases, for instance DirectXShaderCompiler needs to be built on Windows 2019/VS2019 --- .github/workflows/build-package.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-package.yaml b/.github/workflows/build-package.yaml index 0f36343a..69e3935e 100644 --- a/.github/workflows/build-package.yaml +++ b/.github/workflows/build-package.yaml @@ -62,6 +62,12 @@ jobs: DOCKER=$(test -e ${PACKPATH%% }/Dockerfile* && echo 1 || echo 0) # Assume the build scripts will use the Dockerfile if found in the package path DOCKERFILE["$PACKAGE"]=1 # Mark Dockerfile check as done fi + + # Special cases for certain packages + if [[ $PACKAGE =~ "DirectXShaderCompilerDxc" ]] && [[ $PLATFORM =~ "windows" ]]; then + OS_RUNNER="windows-2019" + fi + PACKAGES_JSON["$PACKAGE"]="{\"package\": \"$PACKAGE\", \"os\": \"$OS_RUNNER\", \"dockerfile\": \"$DOCKER\"}" done unset IFS From fedd6f2b39b4e2f18518ba4f3a0d4f80ce648f57 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:31:51 -0400 Subject: [PATCH 08/10] Revert "Testing old package" This reverts commit a13f4672668f91d622413a440e3064f49caf7029. --- .../FindDirectXShaderCompilerDxc.cmake.Windows | 1 + package-system/DirectXShaderCompiler/install_dxc_windows.cmd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows index cd2c0abe..696a25a3 100644 --- a/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows +++ b/package-system/DirectXShaderCompiler/FindDirectXShaderCompilerDxc.cmake.Windows @@ -19,6 +19,7 @@ add_library(${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL) set(${MY_NAME}_RUNTIME_DEPENDENCIES ${${MY_NAME}_BINARY_DIR}/Release/dxc.exe + ${${MY_NAME}_BINARY_DIR}/Release/dxsc.exe ${${MY_NAME}_BINARY_DIR}/Release/dxil.dll ${${MY_NAME}_BINARY_DIR}/Release/dxcompiler.dll) ly_add_target_files(TARGETS ${TARGET_WITH_NAMESPACE} OUTPUT_SUBDIRECTORY ${output_subfolder} FILES ${${MY_NAME}_RUNTIME_DEPENDENCIES}) diff --git a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd index ba502398..7824f1b2 100644 --- a/package-system/DirectXShaderCompiler/install_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/install_dxc_windows.cmd @@ -38,7 +38,7 @@ echo Copying %BLD_PATH%\Release\bin\dxsc.exe to %BIN_PATH%\Release\ copy /Y %BLD_PATH%\Release\bin\dxsc.exe %BIN_PATH%\Release\ IF %ERRORLEVEL% NEQ 0 ( ECHO Unable to copy %BLD_PATH%\Release\bin\dxsc.exe - REM exit /b 1 + exit /b 1 ) ECHO Copying %BLD_PATH%\Release\bin\dxcompiler.dll to %BIN_PATH%\\Release\ From 2ffae9daeb0a51eb4fd41cd7cffdc5a24e0a8190 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:31:58 -0400 Subject: [PATCH 09/10] Revert "Revert to previous tag to test asset failure" This reverts commit 953da2c20e181bea3830d31a59389404772acddf. --- package-system/DirectXShaderCompiler/build_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-system/DirectXShaderCompiler/build_config.json b/package-system/DirectXShaderCompiler/build_config.json index b81c22b0..d7ed308d 100644 --- a/package-system/DirectXShaderCompiler/build_config.json +++ b/package-system/DirectXShaderCompiler/build_config.json @@ -1,6 +1,6 @@ { "git_url":"https://github.com/o3de/DirectXShaderCompiler.git", - "git_tag":"release-1.7.2308-o3de", + "git_tag":"release-1.7.2308-o3de.2", "package_name":"DirectXShaderCompilerDxc", "package_version":"1.7.2308-o3de-rev2", "package_url":"https://github.com/o3de/DirectXShaderCompiler", From 79037c05f648655df1754a21851687b8b9d1f761 Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:32:06 -0400 Subject: [PATCH 10/10] Revert "Update to vs2022 for DirectXShaderCompiler win" This reverts commit fb7cf13a6090a2848bc9e92b04faa662012151f4. --- package-system/DirectXShaderCompiler/build_dxc_windows.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd index c1e0322a..2d90fc47 100755 --- a/package-system/DirectXShaderCompiler/build_dxc_windows.cmd +++ b/package-system/DirectXShaderCompiler/build_dxc_windows.cmd @@ -29,9 +29,9 @@ IF %ERRORLEVEL% NEQ 0 ( ) REM Run the build for Release -call utils\hct\hctbuild.cmd -rel -x64 -vs2022 -spirv +call utils\hct\hctbuild.cmd -rel -x64 -vs2019 -spirv IF %ERRORLEVEL% NEQ 0 ( - ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2022 Failed" + ECHO "Building Release with hctbuild.cmd -rel -x64 -vs2019 Failed" exit /b 1 )