Browse Source

Merge pull request #60 from aws-lumberyard-dev/Atom/galibzon/azslc_1.7.34

Release of AZSLc 1.7.34 for Windows, Mac & Linux.
galibzon 3 năm trước cách đây
mục cha
commit
28a2415178

+ 1 - 2
package-system/azslc/Findazslc.cmake.Windows

@@ -15,8 +15,7 @@ set(output_subfolder "Builders/AZSLc")
 set($${MY_NAME}_BINARY_DIR $${CMAKE_CURRENT_LIST_DIR}/$${MY_NAME}/bin)
 set($${MY_NAME}_BINARY_DIR $${CMAKE_CURRENT_LIST_DIR}/$${MY_NAME}/bin)
 
 
 set($${MY_NAME}_RUNTIME_DEPENDENCIES
 set($${MY_NAME}_RUNTIME_DEPENDENCIES
-        $${$${MY_NAME}_BINARY_DIR}/win_x64/Release/azslc.exe
-        $${$${MY_NAME}_BINARY_DIR}/win_x64/Release/boost_regex-vc142-mt-x64-1_70.dll
+        $${$${MY_NAME}_BINARY_DIR}/Release/azslc.exe
 )
 )
 
 
 add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)

+ 2 - 2
package-system/azslc/build_config.json

@@ -1,8 +1,8 @@
 {
 {
    "git_url":"https://github.com/o3de/o3de-azslc.git",
    "git_url":"https://github.com/o3de/o3de-azslc.git",
-   "git_tag":"1.7.23",
+   "git_tag":"1.7.34",
    "package_name":"azslc",
    "package_name":"azslc",
-   "package_version":"1.7.23-rev2",
+   "package_version":"1.7.34-rev1",
    "package_url":"https://github.com/o3de/o3de-azslc",
    "package_url":"https://github.com/o3de/o3de-azslc",
    "package_license":"CUSTOM",
    "package_license":"CUSTOM",
    "package_license_file":"LICENSE.txt",
    "package_license_file":"LICENSE.txt",

+ 0 - 1
package-system/azslc/install_azslc_windows.cmd

@@ -24,6 +24,5 @@ copy /Y %SRC_PATH%\LICENSE_MIT.TXT %TARGET_INSTALL_ROOT%\
 mkdir %BIN_PATH%\Release
 mkdir %BIN_PATH%\Release
 
 
 copy /Y %SRC_PATH%\build\win_x64\Release\azslc.exe %BIN_PATH%\Release\
 copy /Y %SRC_PATH%\build\win_x64\Release\azslc.exe %BIN_PATH%\Release\
-copy /Y %SRC_PATH%\build\win_x64\Release\boost_regex-vc142-mt-x64-1_70.dll %BIN_PATH%\Release\
 
 
 exit /b 0
 exit /b 0

+ 2 - 2
package_build_list_host_darwin.json

@@ -33,7 +33,7 @@
         "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",
         "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-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean",
-        "azslc-1.7.23-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Mac --package-root ../../package-system --clean",
+        "azslc-1.7.34-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Mac --package-root ../../package-system --clean",
         "python-3.7.10-rev1-darwin": "package-system/python/build_package_image.py",
         "python-3.7.10-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",
         "mcpp-2.7.2_az.2-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.2-rev1",
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
@@ -82,7 +82,7 @@
         "squish-ccr-deb557d-rev1-mac": "package-system/squish-ccr-mac",
         "squish-ccr-deb557d-rev1-mac": "package-system/squish-ccr-mac",
         "astc-encoder-3.2-rev1-mac": "package-system/astc-encoder-mac",
         "astc-encoder-3.2-rev1-mac": "package-system/astc-encoder-mac",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "package-system/DirectXShaderCompilerDxc-mac",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "package-system/DirectXShaderCompilerDxc-mac",
-        "azslc-1.7.23-rev2-mac": "package-system/azslc-mac",
+        "azslc-1.7.34-rev1-mac": "package-system/azslc-mac",
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev5-mac": "package-system/qt-mac",
         "qt-5.15.2-rev5-mac": "package-system/qt-mac",

+ 2 - 2
package_build_list_host_linux.json

@@ -24,7 +24,7 @@
         "squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --package-root ../../package-system --clean",
         "squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean",
-        "azslc-1.7.23-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system --clean",
+        "azslc-1.7.34-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system --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",
         "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.7.10-rev2-linux": "package-system/python/build_package_image.py",
         "python-3.7.10-rev2-linux": "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
@@ -49,7 +49,7 @@
         "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",
         "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",
         "astc-encoder-3.2-rev1-linux": "package-system/astc-encoder-linux",
         "astc-encoder-3.2-rev1-linux": "package-system/astc-encoder-linux",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "package-system/DirectXShaderCompilerDxc-linux",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "package-system/DirectXShaderCompilerDxc-linux",
-        "azslc-1.7.23-rev2-linux": "package-system/azslc-linux",
+        "azslc-1.7.34-rev1-linux": "package-system/azslc-linux",
         "tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux",
         "tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux",
         "python-3.7.10-rev2-linux": "package-system/python/linux_x64/package",
         "python-3.7.10-rev2-linux": "package-system/python/linux_x64/package",
         "PhysX-4.1.2.29882248-rev3-linux": "package-system/PhysX-linux",
         "PhysX-4.1.2.29882248-rev3-linux": "package-system/PhysX-linux",

+ 2 - 2
package_build_list_host_windows.json

@@ -31,7 +31,7 @@
         "squish-ccr-deb557d-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean",
         "squish-ccr-deb557d-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
-        "azslc-1.7.23-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system --clean",
+        "azslc-1.7.34-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system --clean",
         "PhysX-4.1.2.29882248-rev3-windows": "package-system/PhysX/build_package_image.py --platform windows",
         "PhysX-4.1.2.29882248-rev3-windows": "package-system/PhysX/build_package_image.py --platform windows",
         "PhysX-4.1.2.29882248-rev3-android": "package-system/PhysX/build_package_image.py --platform android",
         "PhysX-4.1.2.29882248-rev3-android": "package-system/PhysX/build_package_image.py --platform android",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth/build_package_image.py --platform-name windows",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth/build_package_image.py --platform-name windows",
@@ -102,7 +102,7 @@
         "squish-ccr-deb557d-rev1-windows": "package-system/squish-ccr-windows",
         "squish-ccr-deb557d-rev1-windows": "package-system/squish-ccr-windows",
         "astc-encoder-3.2-rev1-windows": "package-system/astc-encoder-windows",
         "astc-encoder-3.2-rev1-windows": "package-system/astc-encoder-windows",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "package-system/DirectXShaderCompilerDxc-windows",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "package-system/DirectXShaderCompilerDxc-windows",
-        "azslc-1.7.23-rev2-windows": "package-system/azslc-windows",
+        "azslc-1.7.34-rev1-windows": "package-system/azslc-windows",
         "zstd-1.35-multiplatform": "package-system/zstd-multiplatform",
         "zstd-1.35-multiplatform": "package-system/zstd-multiplatform",
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform",
         "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform",