Skip to content

Commit

Permalink
Merge branch 'main' into update_azslc
Browse files Browse the repository at this point in the history
  • Loading branch information
akioCL committed Jul 14, 2024
2 parents 1609446 + 0d329a0 commit cc06537
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 33 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
18 changes: 9 additions & 9 deletions package-system/AWSNativeSDK/build_config.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
Expand All @@ -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", "" ]
],
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions package-system/DirectXShaderCompiler/build_config.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
7 changes: 7 additions & 0 deletions package-system/DirectXShaderCompiler/install_dxc_windows.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
12 changes: 6 additions & 6 deletions package_build_list_host_darwin.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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.20-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",
Expand All @@ -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",
Expand Down Expand Up @@ -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.20-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",
Expand Down
8 changes: 4 additions & 4 deletions package_build_list_host_linux-aarch64.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"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.20-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",
Expand Down Expand Up @@ -49,10 +49,10 @@
"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.20-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",
Expand Down
12 changes: 6 additions & 6 deletions package_build_list_host_linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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.20-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",
Expand All @@ -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",
Expand All @@ -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.20-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",
Expand Down
Loading

0 comments on commit cc06537

Please sign in to comment.