update dxc package to revision 3 (#20)

* Update 3p source folder DXC package referenced revision
* Remove references to a debug build of DXC
* Update the SPDX-Licenses file to ref windows package
* Fix incorrect error string in pull_and_build_from_git script

Signed-off-by: rgba16f <[email protected]>

SPDX-Licenses.txt

@@ -54,17 +54,11 @@
     "LicenseFile" : "d3dx12/license.txt"
 },
 {
-    "PackageName" : "DirectXShaderCompilerDxc-2020.08.07-rev1-multiplatform",
+    "PackageName" : "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows",
     "URL"         : "https://github.com/Microsoft/DirectXShaderCompiler",
     "SPDX-License-Identifier": "NCSA",
     "LicenseFile" : "DirectXShaderCompilerDxc/LICENSE.TXT"
 },
-{
-    "PackageName" : "DirectXShaderCompilerDxcAz-5.0.0_az-rev1-multiplatform",
-    "URL"         : "https://github.com/galibzon/dxc-az",
-    "SPDX-License-Identifier": "NCSA",
-    "LicenseFile" : "DirectXShaderCompilerDxcAz/LICENSE.TXT"
-},
 {
     "PackageName" : "etc2comp-9cd0f9cae0-rev1-windows",
     "URL"         : "https://github.com/google/etc2comp",

Scripts/extras/pull_and_build_from_git.py

@@ -601,7 +601,7 @@ class BuildInfo(object):
                                          cwd=str(self.base_folder),
                                          env=custom_install_env)
             if call_result.returncode != 0:
-                raise BuildError(f"Error executing custom build command {custom_build_cmd}")
+                raise BuildError(f"Error executing custom install command {custom_install_cmd}")
 
     def check_build_keys(self, keys_to_check):
         """

package-system/DirectXShaderCompiler/install_dxc_windows.cmd

@@ -25,38 +25,6 @@ IF NOT EXIST %DXIL_PATH% (
     exit /b 1
 )
 
-
-mkdir %BIN_PATH%\Release
-
-echo Copying LICENSE.TXT to %TARGET_INSTALL_ROOT%
-copy /Y %SRC_PATH%\\LICENSE.TXT %TARGET_INSTALL_ROOT%\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO Unable to copy LICENSE.TXT
-    exit /b 1
-)
-
-mkdir %BIN_PATH%\Debug
-echo Copying %BLD_PATH%\Debug\bin\dxc.exe to %BIN_PATH%\Debug\
-copy /Y %BLD_PATH%\Debug\bin\dxc.exe %BIN_PATH%\Debug\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO Unable to copy %BLD_PATH%\Debug\bin\dxc.exe
-    exit /b 1
-)
-
-echo Copying %BLD_PATH%\Debug\bin\dxcompiler.dll to %BIN_PATH%\Debug\
-copy /Y %BLD_PATH%\Debug\bin\dxcompiler.dll %BIN_PATH%\Debug\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO Unable to copy %BLD_PATH%\Debug\bin\dxcompiler.dll
-    exit /b 1
-)
-
-echo Copying %DXIL_PATH% to %BIN_PATH%\Debug\
-copy /Y %DXIL_PATH% %BIN_PATH%\Debug\
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO Unable to copy %DXIL_PATH%
-    exit /b 1
-)
-
 mkdir %BIN_PATH%\Release
 
 echo Copying %BLD_PATH%\Release\bin\dxc.exe to %BIN_PATH%\Release\

package_build_list_host_darwin.json

@@ -28,7 +28,7 @@
         "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
         "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd/build_package_image.py --platform-name mac",
         "SPIRVCross-2021.04.29-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean",
-        "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-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",
         "tiff-4.2.0.10-mac" : "package-system/tiff/build_package_image.py --platform mac",
         "tiff-4.2.0.10-ios" : "package-system/tiff/build_package_image.py --platform ios",
@@ -72,7 +72,7 @@
         "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd-mac",
         "mcpp-2.7.2_az.1-rev1-mac": "package-system/mcpp-mac",
         "SPIRVCross-2021.04.29-rev1-mac": "package-system/SPIRVCross-mac",
-        "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-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",
         "SQLite-3.32.2-rev3-multiplatform" : "package-system/SQLite-multiplatform",
         "xxhash-0.7.4-rev1-multiplatform":  "package-system/xxhash-multiplatform",

package_build_list_host_linux.json

@@ -20,7 +20,7 @@
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
         "v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
         "SPIRVCross-2021.04.29-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean",
-        "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-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",
         "tiff-4.2.0.10-linux" : "package-system/tiff/build_package_image.py --platform linux",
         "python-3.7.10-rev2-linux" : "package-system/python/build_package_image.py",
@@ -41,7 +41,7 @@
         "OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL-linux",
         "ilmbase-2.3.0-rev4-linux": "package-system/ilmbase-linux",
         "SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
-        "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-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",
         "tiff-4.2.0.10-linux" : "package-system/tiff-linux",
         "python-3.7.10-rev2-linux" : "package-system/python/linux_x64/package",

package_build_list_host_windows.json

@@ -26,7 +26,7 @@
         "OpenSSL-1.1.1b-rev1-android": "package-system/OpenSSL/build_package_image.py --platform-name android",
         "ilmbase-2.3.0-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Windows --package-root ../../package-system --clean",
         "SPIRVCross-2021.04.29-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean",
-        "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-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",
         "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",
@@ -93,7 +93,7 @@
     "openimageio-2.1.16.0-rev2-windows": "package-system/openimageio-windows",
     "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd-windows",
     "SPIRVCross-2021.04.29-rev1-windows": "package-system/SPIRVCross-windows",
-    "DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-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",
     "zstd-1.35-multiplatform": "package-system/zstd-multiplatform",
     "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",