Merge branch 'main' into Prism/gem-db

scripts/build/Jenkins/Jenkinsfile

@@ -313,13 +313,13 @@ def PreBuildCommonSteps(Map pipelineConfig, String repositoryName, String projec
                 script: 'python/get_python.bat'
         }
 
-        if(env.CLEAN_OUTPUT_DIRECTORY?.toBoolean() || env.CLEAN_ASSETS?.toBoolean()) {
-            def command = "${pipelineConfig.PYTHON_DIR}/python"
-            if(env.IS_UNIX) command += '.sh'
-            else command += '.cmd'
-            command += " -u ${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type clean"
-            palSh(command, "Running ${platform} clean")
-        }
+        // Always run the clean step, the scripts detect what variables were set, but it also cleans if
+        // the NODE_LABEL has changed
+        def command = "${pipelineConfig.PYTHON_DIR}/python"
+        if(env.IS_UNIX) command += '.sh'
+        else command += '.cmd'
+        command += " -u ${pipelineConfig.BUILD_ENTRY_POINT} --platform ${platform} --type clean"
+        palSh(command, "Running ${platform} clean")
     }
 }
 

scripts/build/Platform/Linux/build_linux.sh

@@ -14,7 +14,6 @@ set -o errexit # exit on the first failure encountered
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/env_linux.sh
-source $BASEDIR/clean_linux.sh
 
 mkdir -p ${OUTPUT_DIRECTORY}
 SOURCE_DIRECTORY=${PWD}

scripts/build/Platform/Mac/build_mac.sh

@@ -14,7 +14,6 @@ set -o errexit # exit on the first failure encountered
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/env_mac.sh
-source $BASEDIR/clean_mac.sh
 
 mkdir -p ${OUTPUT_DIRECTORY}
 SOURCE_DIRECTORY=${PWD}

scripts/build/Platform/Windows/build_config.json

@@ -87,7 +87,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "debug",
       "OUTPUT_DIRECTORY": "build\\windows_vs2019",
-      "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_BUILD_WITH_INCREMENTAL_LINKING_DEBUG=FALSE",
+      "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
@@ -101,7 +101,7 @@
     "PARAMETERS": {
       "CONFIGURATION": "debug",
       "OUTPUT_DIRECTORY": "build\\windows_vs2019",
-      "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_BUILD_WITH_INCREMENTAL_LINKING_DEBUG=FALSE",
+      "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
@@ -306,6 +306,20 @@
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
+  "windows_installer": {
+    "TAGS": [
+      "package"
+    ],
+    "COMMAND": "build_installer_windows.cmd",
+    "PARAMETERS": {
+        "CONFIGURATION": "profile",
+        "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DCPACK_WIX_ROOT=\"!WIX!\"",
+        "CMAKE_LY_PROJECTS": "",
+        "CMAKE_TARGET": "ALL_BUILD",
+        "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
+    }
+  },
   "project_enginesource_profile_vs2019": {
     "TAGS": [
       "project"

scripts/build/Platform/Windows/build_installer_windows.cmd

@@ -0,0 +1,22 @@
+@ECHO OFF
+REM
+REM All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+REM its licensors.
+REM
+REM For complete copyright and license terms please see the LICENSE at the root of this
+REM distribution (the "License"). All use of this software is governed by the License,
+REM or, if provided, by the license below or the license accompanying this file. Do not
+REM remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM
+
+CALL "%~dp0build_windows.cmd"
+IF NOT %ERRORLEVEL%==0 GOTO :error
+
+CALL "%~dp0installer_windows.cmd"
+IF NOT %ERRORLEVEL%==0 GOTO :error
+
+EXIT /b 0
+
+:error
+EXIT /b 1

scripts/build/Platform/Windows/build_windows.cmd

@@ -13,7 +13,6 @@ REM
 SETLOCAL EnableDelayedExpansion
 
 CALL %~dp0env_windows.cmd
-CALL %~dp0clean_windows.cmd
 
 IF NOT EXIST "%OUTPUT_DIRECTORY%" (
     MKDIR %OUTPUT_DIRECTORY%.

scripts/build/Platform/Windows/installer_windows.cmd

@@ -0,0 +1,64 @@
+@ECHO OFF
+REM
+REM All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+REM its licensors.
+REM
+REM For complete copyright and license terms please see the LICENSE at the root of this
+REM distribution (the "License"). All use of this software is governed by the License,
+REM or, if provided, by the license below or the license accompanying this file. Do not
+REM remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM
+
+SETLOCAL EnableDelayedExpansion
+
+CALL %~dp0env_windows.cmd
+
+IF NOT EXIST %OUTPUT_DIRECTORY% (
+    ECHO [ci_build] Error: $OUTPUT_DIRECTORY was not found
+    GOTO :error
+)
+PUSHD %OUTPUT_DIRECTORY%
+
+REM Override the temporary directory used by wix to the workspace
+SET "WIX_TEMP=!WORKSPACE!/temp/wix"
+IF NOT EXIST "%WIX_TEMP%" (
+    MKDIR "%WIX_TEMP%"
+)
+
+REM Make sure we are using the CMake version of CPack and not the one that comes with chocolatey
+SET CPACK_PATH=
+IF "%LY_CMAKE_PATH%"=="" (
+    REM quote the paths from 'where' so we can properly tokenize ones in the list with spaces
+    FOR /F delims^=^"^ tokens^=1 %%i in ('where /F cpack') DO (
+        REM The cpack in chocolatey expects a number supplied with --version so it will error
+        "%%i" --version > NUL
+        IF !ERRORLEVEL!==0 (
+            SET "CPACK_PATH=%%i"
+            GOTO :run_cpack
+        )
+    )
+) ELSE (
+    SET "CPACK_PATH=%LY_CMAKE_PATH%\cpack.exe"
+)
+
+:run_cpack
+ECHO [ci_build] "!CPACK_PATH!" --version
+"!CPACK_PATH!" --version
+IF ERRORLEVEL 1 (
+    ECHO [ci_build] CPack not found!
+    GOTO :popd_error
+)
+
+ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION%
+"!CPACK_PATH!"  -C %CONFIGURATION%
+IF NOT %ERRORLEVEL%==0 GOTO :popd_error
+
+POPD
+EXIT /b 0
+
+:popd_error
+POPD
+
+:error
+EXIT /b 1

scripts/build/build_node/Platform/Windows/install_utiltools.ps1

@@ -29,3 +29,6 @@ choco install corretto8jdk -y --ia INSTALLDIR="c:\jdk8" # Custom directory to ha
 
 # Install CMake
 choco install cmake -y --installargs 'ADD_CMAKE_TO_PATH=System'
+
+# Install Windows Installer XML toolkit (WiX)
+choco install wixtoolset -y