From a1b8d1233cb75a330adfd260ad85c827f163f84d Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 11:28:22 -0700
Subject: [PATCH 01/18] [cpack_installer] initial work for installer Jenkins
 jobs

---
 .../build/Platform/Windows/build_config.json  | 15 ++++++++
 .../Windows/build_installer_windows.cmd       | 22 +++++++++++
 .../build/Platform/Windows/build_windows.cmd  |  9 +++++
 .../Platform/Windows/installer_windows.cmd    | 38 +++++++++++++++++++
 .../Platform/Windows/install_utiltools.ps1    |  3 ++
 5 files changed, 87 insertions(+)
 create mode 100644 scripts/build/Platform/Windows/build_installer_windows.cmd
 create mode 100644 scripts/build/Platform/Windows/installer_windows.cmd

diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index 38cd7d6ad8..b0d16f1fb6 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -306,6 +306,21 @@
         "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",
+        "CMAKE_INCLUDE_WIX": "True",
+        "CMAKE_LY_PROJECTS": "",
+        "CMAKE_TARGET": "ALL_BUILD",
+        "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
+    }
+  },
   "project_enginesource_profile_vs2019": {
     "TAGS": [
       "project"
diff --git a/scripts/build/Platform/Windows/build_installer_windows.cmd b/scripts/build/Platform/Windows/build_installer_windows.cmd
new file mode 100644
index 0000000000..0d50f4b57a
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index 3e995e1905..109db3438e 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -38,6 +38,15 @@ IF NOT EXIST %TMP% (
 REM Compute half the amount of processors so some jobs can run
 SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
 
+IF %CMAKE_INCLUDE_WIX%=="True" (
+    REM Explicitly enable wix via command line arg for forensic logging
+    SET EXTRA_CMAKE_OPTIONS=%EXTRA_CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
+)
+ELSE (
+    REM Disable implicit enabling of windows packing by clearing out the wix variable
+    SET WIX=
+)
+
 SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
 SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" -DLY_PROJECTS=%CMAKE_LY_PROJECTS%
 IF NOT EXIST CMakeCache.txt (
diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
new file mode 100644
index 0000000000..c613f0a1e3
--- /dev/null
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -0,0 +1,38 @@
+@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 EBS volume
+SET "WIX_TEMP=!WORKSPACE!/temp/wix"
+
+REM Run cpack
+ECHO [ci_build] cpack -C %CONFIGURATION%
+cpack  -C %CONFIGURATION%
+IF NOT %ERRORLEVEL%==0 GOTO :popd_error
+
+POPD
+EXIT /b 0
+
+:popd_error
+POPD
+
+:error
+EXIT /b 1
\ No newline at end of file
diff --git a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
index 4e3695d35d..35ae04cc09 100644
--- a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
+++ b/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 WIX
+choco install wixtoolset -y

From cfd06f2e4a46869052dd5d6e5baee03d21860d35 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 13:10:11 -0700
Subject: [PATCH 02/18] [cpack_installer] added check for desired cmake version
 to be at least greater than minimum required plus minor cleanup

---
 cmake/Packaging.cmake                          | 10 ++++++++--
 cmake/Platform/Windows/Packaging_windows.cmake |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 84bad13687..e7136eab12 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -51,6 +51,12 @@ if(NOT CPACK_GENERATOR)
     return()
 endif()
 
+if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION})
+    message(FATAL_ERROR
+        "The desired version of CMake to be included in the package is "
+        "is below the minium required version of CMake to run")
+endif()
+
 # pull down the desired copy of CMake so it can be included in the package
 if(NOT (CPACK_CMAKE_PACKAGE_FILE AND CPACK_CMAKE_PACKAGE_HASH))
     message(FATAL_ERROR
@@ -67,7 +73,7 @@ list(GET _version_componets 1 _minor_version)
 set(_url_version_tag "v${_major_version}.${_minor_version}")
 set(_package_url "https://cmake.org/files/${_url_version_tag}/${CPACK_CMAKE_PACKAGE_FILE}")
 
-message(STATUS "Ensuring CMake ${CPACK_DESIRED_CMAKE_VERSION} is available for packaging...")
+message(STATUS "Downloading CMake ${CPACK_DESIRED_CMAKE_VERSION} for packaging...")
 download_file(
     URL ${_package_url}
     TARGET_FILE ${_cmake_package_dest}
@@ -77,7 +83,7 @@ download_file(
 list(GET _results 0 _status_code)
 
 if (${_status_code} EQUAL 0 AND EXISTS ${_cmake_package_dest})
-    message(STATUS "-> Package found and verified!")
+    message(STATUS "Package found and verified!")
 else()
     file(REMOVE ${_cmake_package_dest})
     list(REMOVE_AT _results 0)
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index db9c7fc906..5210c24e7b 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -12,7 +12,7 @@
 set(LY_WIX_PATH "" CACHE PATH "Path to the WiX install path")
 
 if(LY_WIX_PATH)
-    file(TO_CMAKE_PATH ${LY_QTIFW_PATH} CPACK_WIX_ROOT)
+    file(TO_CMAKE_PATH ${LY_WIX_PATH} CPACK_WIX_ROOT)
 elseif(DEFINED ENV{WIX})
     file(TO_CMAKE_PATH $ENV{WIX} CPACK_WIX_ROOT)
 endif()
@@ -26,7 +26,7 @@ else()
     return()
 endif()
 
-set(CPACK_GENERATOR "WIX")
+set(CPACK_GENERATOR WIX)
 
 set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64")
 set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.zip")

From 12cdaed03e0c968630c4b27d25d86cdeede3c389 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 13:58:37 -0700
Subject: [PATCH 03/18] [cpack_installer] updated installer icon/logo

---
 cmake/Platform/Windows/Packaging/product_icon.ico | 4 ++--
 cmake/Platform/Windows/Packaging/product_logo.png | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/Platform/Windows/Packaging/product_icon.ico b/cmake/Platform/Windows/Packaging/product_icon.ico
index 0680ceea19..e7b77c35bf 100644
--- a/cmake/Platform/Windows/Packaging/product_icon.ico
+++ b/cmake/Platform/Windows/Packaging/product_icon.ico
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a
-size 107016
+oid sha256:d717f77fe01f45df934a61bbc215e5322447d21e16f3cebcf2a02f148178f266
+size 106449
diff --git a/cmake/Platform/Windows/Packaging/product_logo.png b/cmake/Platform/Windows/Packaging/product_logo.png
index d5fd60ffb8..ac9c06f8f1 100644
--- a/cmake/Platform/Windows/Packaging/product_logo.png
+++ b/cmake/Platform/Windows/Packaging/product_logo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac0348c906c91de864cba91c0231b4794d8a00fafa630d13f2232351b90aa59b
+oid sha256:8c804a6be619b9f35cad46eab30b94def7a4ac7142a92cb3f7c78a659381d834
 size 11074

From 4b40f23d0b63cdf5b75188000c843e08c168c139 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 14:06:27 -0700
Subject: [PATCH 04/18] [cpack_installer] couple small fixes to installer
 Jenkins scripts

---
 scripts/build/Platform/Windows/build_windows.cmd     | 5 ++---
 scripts/build/Platform/Windows/installer_windows.cmd | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index 109db3438e..a2f42b75cf 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -38,11 +38,10 @@ IF NOT EXIST %TMP% (
 REM Compute half the amount of processors so some jobs can run
 SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
 
-IF %CMAKE_INCLUDE_WIX%=="True" (
+IF "%CMAKE_INCLUDE_WIX%"=="True" (
     REM Explicitly enable wix via command line arg for forensic logging
     SET EXTRA_CMAKE_OPTIONS=%EXTRA_CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
-)
-ELSE (
+) ELSE (
     REM Disable implicit enabling of windows packing by clearing out the wix variable
     SET WIX=
 )
diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index c613f0a1e3..e8ce10ff14 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -22,6 +22,9 @@ PUSHD %OUTPUT_DIRECTORY%
 
 REM Override the temporary directory used by wix to the EBS volume
 SET "WIX_TEMP=!WORKSPACE!/temp/wix"
+IF NOT EXIST "%WIX_TEMP%" (
+    MKDIR %WIX_TEMP%
+)
 
 REM Run cpack
 ECHO [ci_build] cpack -C %CONFIGURATION%

From c6e4e3ed1fd549d88e27a0aac254ec3ab267bc98 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 14:57:18 -0700
Subject: [PATCH 05/18] [cpack_installer] few more small fixes to installer
 Jenkins scripts

---
 scripts/build/Platform/Windows/build_windows.cmd                | 2 +-
 scripts/build/build_node/Platform/Windows/install_utiltools.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index a2f42b75cf..799e6828b2 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -40,7 +40,7 @@ SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
 
 IF "%CMAKE_INCLUDE_WIX%"=="True" (
     REM Explicitly enable wix via command line arg for forensic logging
-    SET EXTRA_CMAKE_OPTIONS=%EXTRA_CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
+    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
 ) ELSE (
     REM Disable implicit enabling of windows packing by clearing out the wix variable
     SET WIX=
diff --git a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
index 35ae04cc09..050e446f52 100644
--- a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
+++ b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1
@@ -30,5 +30,5 @@ 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 WIX
+# Install Windows Installer XML toolkit (WiX)
 choco install wixtoolset -y

From 134258c18acff77588b7f57d8200d069144ecc2a Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 15:03:26 -0700
Subject: [PATCH 06/18] [cpack_installer] add trailing newline to some new
 files

---
 scripts/build/Platform/Windows/build_installer_windows.cmd | 2 +-
 scripts/build/Platform/Windows/installer_windows.cmd       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Platform/Windows/build_installer_windows.cmd b/scripts/build/Platform/Windows/build_installer_windows.cmd
index 0d50f4b57a..4f31fee085 100644
--- a/scripts/build/Platform/Windows/build_installer_windows.cmd
+++ b/scripts/build/Platform/Windows/build_installer_windows.cmd
@@ -19,4 +19,4 @@ IF NOT %ERRORLEVEL%==0 GOTO :error
 EXIT /b 0
 
 :error
-EXIT /b 1
\ No newline at end of file
+EXIT /b 1
diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index e8ce10ff14..e3a60fee1c 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -38,4 +38,4 @@ EXIT /b 0
 POPD
 
 :error
-EXIT /b 1
\ No newline at end of file
+EXIT /b 1

From 197241f16d4a7f0ec6bfc33af715d43aff93e6e8 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 15:40:41 -0700
Subject: [PATCH 07/18] [cpack_installer] fixed issue with cpack selection

---
 scripts/build/Platform/Windows/installer_windows.cmd | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index e3a60fee1c..824a461a4b 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -26,9 +26,17 @@ 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 chocolaty
+IF "%LY_CMAKE_PATH%"=="" (
+    for /f %%i in ('where cmake') do SET "CMAKE_EXE_PATH=%%i"
+    for %%F in ("%CMAKE_EXE_PATH%") do SET "CMAKE_INSTALL_PATH=%%~dpF"
+) ELSE (
+    SET "CMAKE_INSTALL_PATH=%LY_CMAKE_PATH%\"
+)
+
 REM Run cpack
-ECHO [ci_build] cpack -C %CONFIGURATION%
-cpack  -C %CONFIGURATION%
+ECHO [ci_build] "%CMAKE_INSTALL_PATH%cpack" -C %CONFIGURATION%
+"%CMAKE_INSTALL_PATH%cpack"  -C %CONFIGURATION%
 IF NOT %ERRORLEVEL%==0 GOTO :popd_error
 
 POPD

From fd8cff6aecb2c93b93e6e09f9927feac563392c7 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 16:10:41 -0700
Subject: [PATCH 08/18] [cpack_installer] second attempt to fix cpack selection

---
 scripts/build/Platform/Windows/installer_windows.cmd | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index 824a461a4b..b1fecaa2cb 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -23,10 +23,11 @@ PUSHD %OUTPUT_DIRECTORY%
 REM Override the temporary directory used by wix to the EBS volume
 SET "WIX_TEMP=!WORKSPACE!/temp/wix"
 IF NOT EXIST "%WIX_TEMP%" (
-    MKDIR %WIX_TEMP%
+    MKDIR "WIX_TEMP%"
 )
 
 REM Make sure we are using the CMake version of CPack and not the one that comes with chocolaty
+SET CMAKE_INSTALL_PATH=
 IF "%LY_CMAKE_PATH%"=="" (
     for /f %%i in ('where cmake') do SET "CMAKE_EXE_PATH=%%i"
     for %%F in ("%CMAKE_EXE_PATH%") do SET "CMAKE_INSTALL_PATH=%%~dpF"
@@ -34,6 +35,11 @@ IF "%LY_CMAKE_PATH%"=="" (
     SET "CMAKE_INSTALL_PATH=%LY_CMAKE_PATH%\"
 )
 
+IF "%CMAKE_INSTALL_PATH%"=="" (
+    ECHO [ci_build] CPack path not found
+    GOTO :popd_error
+)
+
 REM Run cpack
 ECHO [ci_build] "%CMAKE_INSTALL_PATH%cpack" -C %CONFIGURATION%
 "%CMAKE_INSTALL_PATH%cpack"  -C %CONFIGURATION%

From 201d6b1b72ec579c980c5e38d58fc354bfcc9a29 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 17:29:50 -0700
Subject: [PATCH 09/18] [cpack_installer] third attempt to fix cpack selection

---
 .../Platform/Windows/installer_windows.cmd    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index b1fecaa2cb..41cc21b35b 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -26,23 +26,29 @@ 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 chocolaty
-SET CMAKE_INSTALL_PATH=
+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%"=="" (
-    for /f %%i in ('where cmake') do SET "CMAKE_EXE_PATH=%%i"
-    for %%F in ("%CMAKE_EXE_PATH%") do SET "CMAKE_INSTALL_PATH=%%~dpF"
+    FOR /F %%i in ('where 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"
+        )
+    )
 ) ELSE (
-    SET "CMAKE_INSTALL_PATH=%LY_CMAKE_PATH%\"
+    SET "CPACK_PATH=%LY_CMAKE_PATH%\cpack.exe"
 )
 
-IF "%CMAKE_INSTALL_PATH%"=="" (
-    ECHO [ci_build] CPack path not found
-    GOTO :popd_error
+ECHO [ci_build] "%CPACK_PATH%" --version
+"%CPACK_PATH%" --version
+IF ERRORLEVEL 1 (
+    ECHO [ci_build] CPack not found!
+    exit /b 1
 )
-
 REM Run cpack
-ECHO [ci_build] "%CMAKE_INSTALL_PATH%cpack" -C %CONFIGURATION%
-"%CMAKE_INSTALL_PATH%cpack"  -C %CONFIGURATION%
+ECHO [ci_build] "%CPACK_PATH%" -C %CONFIGURATION%
+"%CPACK_PATH%"  -C %CONFIGURATION%
 IF NOT %ERRORLEVEL%==0 GOTO :popd_error
 
 POPD

From 01f3ba560819fcba0d3a5575510e597904cced4f Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 17:58:58 -0700
Subject: [PATCH 10/18] [cpack_installer] fourth attempt to fix cpack selection

---
 scripts/build/Platform/Windows/installer_windows.cmd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index 41cc21b35b..ef284290f3 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -23,7 +23,7 @@ PUSHD %OUTPUT_DIRECTORY%
 REM Override the temporary directory used by wix to the EBS volume
 SET "WIX_TEMP=!WORKSPACE!/temp/wix"
 IF NOT EXIST "%WIX_TEMP%" (
-    MKDIR "WIX_TEMP%"
+    MKDIR "%WIX_TEMP%"
 )
 
 REM Make sure we are using the CMake version of CPack and not the one that comes with chocolatey
@@ -40,15 +40,15 @@ IF "%LY_CMAKE_PATH%"=="" (
     SET "CPACK_PATH=%LY_CMAKE_PATH%\cpack.exe"
 )
 
-ECHO [ci_build] "%CPACK_PATH%" --version
-"%CPACK_PATH%" --version
+ECHO [ci_build] "!CPACK_PATH!" --version
+"!CPACK_PATH!" --version
 IF ERRORLEVEL 1 (
     ECHO [ci_build] CPack not found!
     exit /b 1
 )
-REM Run cpack
-ECHO [ci_build] "%CPACK_PATH%" -C %CONFIGURATION%
-"%CPACK_PATH%"  -C %CONFIGURATION%
+
+ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION%
+"!CPACK_PATH!"  -C %CONFIGURATION%
 IF NOT %ERRORLEVEL%==0 GOTO :popd_error
 
 POPD

From 3f9811e498efdb07e9275a3395f201b65ce8aa0f Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 18:40:22 -0700
Subject: [PATCH 11/18] [cpack_installer] fifth attempt to fix cpack selection

---
 scripts/build/Platform/Windows/installer_windows.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index ef284290f3..73d1a3d88c 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -31,7 +31,7 @@ SET CPACK_PATH=
 IF "%LY_CMAKE_PATH%"=="" (
     FOR /F %%i in ('where cpack') DO (
         REM The cpack in chocolatey expects a number supplied with --version so it will error
-        %%i --version > NUL
+        "%%i" --version > NUL
         IF !ERRORLEVEL!==0 (
             SET "CPACK_PATH=%%i"
         )

From b09f73378f3efc08f7fa775e1f49bd38b30f63f3 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 20:49:39 -0700
Subject: [PATCH 12/18] [cpack_installer] replaced LY_DEFAULT_INSTALL_COMPONENT
 with built-in CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.  updated stale references
 to ly_install_target_COMPONENT with a get_prop call

---
 cmake/3rdParty.cmake                       |  2 -
 cmake/Packaging.cmake                      |  4 +-
 cmake/Platform/Common/Install_common.cmake | 46 ++++++++--------------
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/cmake/3rdParty.cmake b/cmake/3rdParty.cmake
index eb11404237..ebf640af23 100644
--- a/cmake/3rdParty.cmake
+++ b/cmake/3rdParty.cmake
@@ -291,7 +291,6 @@ function(ly_install_external_target 3RDPARTY_ROOT_DIRECTORY)
     # Install the Find file to our <install_location>/cmake directory
     install(FILES ${CMAKE_CURRENT_LIST_FILE}
         DESTINATION cmake
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # We only want to install external targets that are part of our source tree
@@ -302,7 +301,6 @@ function(ly_install_external_target 3RDPARTY_ROOT_DIRECTORY)
         get_filename_component(rel_path ${rel_path} DIRECTORY)
         install(DIRECTORY ${3RDPARTY_ROOT_DIRECTORY}
             DESTINATION ${rel_path}
-            COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
         )
     endif()
 
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index e7136eab12..1bcb251271 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -101,7 +101,7 @@ endif()
 
 install(FILES ${_cmake_package_dest}
     DESTINATION ./Tools/Redistributables/CMake
-    COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+    COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
 )
 
 # IMPORTANT: required to be included AFTER setting all property overrides
@@ -141,7 +141,7 @@ endfunction()
 
 # configure ALL components here
 ly_configure_cpack_component(
-    ${LY_DEFAULT_INSTALL_COMPONENT} REQUIRED
+    ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} REQUIRED
     DISPLAY_NAME "${PROJECT_NAME} Core"
     DESCRIPTION "${PROJECT_NAME} Headers, Libraries and Tools"
 )
diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index 710a8b266f..e0301bb914 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -11,7 +11,7 @@
 
 set(CMAKE_INSTALL_MESSAGE NEVER) # Simplify messages to reduce output noise
 
-ly_set(LY_DEFAULT_INSTALL_COMPONENT Core)
+ly_set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME Core)
 
 file(RELATIVE_PATH runtime_output_directory ${CMAKE_BINARY_DIR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 file(RELATIVE_PATH library_output_directory ${CMAKE_BINARY_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
@@ -27,6 +27,12 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
     # De-alias target name
     ly_de_alias_target(${ALIAS_TARGET_NAME} TARGET_NAME)
 
+    # get the component ID.  if the property isn't set for the target, fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
+    get_target_property(install_componet ${TARGET_NAME} INSTALL_COMPONENT)
+    if("${install_componet}" STREQUAL "install_componet-NOTFOUND")
+        unset(install_componet)
+    endif()
+
     # All include directories marked PUBLIC or INTERFACE will be installed. We dont use PUBLIC_HEADER because in order to do that
     # we need to set the PUBLIC_HEADER property of the target for all the headers we are exporting. After doing that, installing the
     # headers end up in one folder instead of duplicating the folder structure of the public/interface include directory.
@@ -41,7 +47,7 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
                 unset(current_public_headers)
                 install(DIRECTORY ${include_directory}
                     DESTINATION ${include_location}/${target_source_dir}
-                    COMPONENT ${ly_install_target_COMPONENT}
+                    COMPONENT ${install_componet}
                     FILES_MATCHING
                         PATTERN *.h
                         PATTERN *.hpp
@@ -68,13 +74,13 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
         TARGETS ${TARGET_NAME}
         ARCHIVE
             DESTINATION ${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>
-            COMPONENT ${ly_install_target_COMPONENT}
+            COMPONENT ${install_componet}
         LIBRARY
             DESTINATION ${library_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_library_output_subdirectory}
-            COMPONENT ${ly_install_target_COMPONENT}
+            COMPONENT ${install_componet}
         RUNTIME
             DESTINATION ${runtime_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_runtime_output_subdirectory}
-            COMPONENT ${ly_install_target_COMPONENT}
+            COMPONENT ${install_componet}
     )
 
     # CMakeLists.txt file
@@ -182,7 +188,7 @@ set_property(TARGET ${TARGET_NAME}
     file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/install/${target_source_dir}/${NAME_PLACEHOLDER}_$<CONFIG>.cmake" CONTENT "${target_file_contents}")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/${target_source_dir}/${NAME_PLACEHOLDER}_$<CONFIG>.cmake"
         DESTINATION ${target_source_dir}
-        COMPONENT ${ly_install_target_COMPONENT}
+        COMPONENT ${install_componet}
     )
 
     # Since a CMakeLists.txt could contain multiple targets, we generate it in a folder per target
@@ -239,9 +245,13 @@ function(ly_setup_subdirectory absolute_target_source_dir)
         "\n"
         "${CREATE_ALIASES_PLACEHOLDER}"
     )
+
+    # get the component ID.  if the property isn't set for the directory, it will auto fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
+    get_property(install_componet DIRECTORY ${absolute_target_source_dir} PROPERTY INSTALL_COMPONENT)
+
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/${target_source_dir}/CMakeLists.txt"
         DESTINATION ${target_source_dir}
-        COMPONENT ${ly_install_target_COMPONENT}
+        COMPONENT ${install_componet}
     )
 
 endfunction()
@@ -262,7 +272,6 @@ function(ly_setup_cmake_install)
 
     install(DIRECTORY "${LY_ROOT_FOLDER}/cmake"
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
         PATTERN "__pycache__" EXCLUDE
         REGEX "Findo3de.cmake" EXCLUDE
         REGEX "Platform\/.*\/BuiltInPackages_.*\.cmake" EXCLUDE
@@ -290,7 +299,6 @@ function(ly_setup_cmake_install)
             "${LY_ROOT_FOLDER}/CMakeLists.txt"
             "${CMAKE_CURRENT_BINARY_DIR}/cmake/engine.json"
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # Collect all Find files that were added with ly_add_external_target_path
@@ -303,7 +311,6 @@ function(ly_setup_cmake_install)
     endforeach()
     install(FILES ${additional_find_files}
         DESTINATION cmake/3rdParty
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # Findo3de.cmake file: we generate a different Findo3de.camke file than the one we have in cmake. This one is going to expose all
@@ -320,7 +327,6 @@ function(ly_setup_cmake_install)
     configure_file(${LY_ROOT_FOLDER}/cmake/install/Findo3de.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake"
         DESTINATION cmake
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # BuiltInPackage_<platform>.cmake: since associations could happen in any cmake file across the engine. We collect
@@ -340,7 +346,6 @@ function(ly_setup_cmake_install)
     )
     install(FILES "${pal_builtin_file}"
         DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
 endfunction()
@@ -362,7 +367,6 @@ endfunction()
 function(ly_copy source_file target_directory)
     file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS})
 endfunction()"
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     unset(runtime_commands)
@@ -408,7 +412,6 @@ endfunction()"
     list(REMOVE_DUPLICATES runtime_commands)
     list(JOIN runtime_commands "    " runtime_commands_str) # the spaces are just to see the right identation in the cmake_install.cmake file
     install(CODE "${runtime_commands_str}"
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
 endfunction()
@@ -427,7 +430,6 @@ function(ly_setup_others)
 
         install(DIRECTORY "${LY_ROOT_FOLDER}/${dir}"
             DESTINATION ${install_path}
-            COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
             PATTERN "__pycache__" EXCLUDE
         )
 
@@ -438,7 +440,6 @@ function(ly_setup_others)
     install(FILES
         ${o3de_scripts}
         DESTINATION ./scripts
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     install(DIRECTORY
@@ -446,7 +447,6 @@ function(ly_setup_others)
         ${LY_ROOT_FOLDER}/scripts/project_manager
         ${LY_ROOT_FOLDER}/scripts/o3de
         DESTINATION ./scripts
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
         PATTERN "__pycache__" EXCLUDE
         PATTERN "CMakeLists.txt" EXCLUDE
         PATTERN "tests" EXCLUDE
@@ -454,7 +454,6 @@ function(ly_setup_others)
 
     install(DIRECTORY "${LY_ROOT_FOLDER}/python"
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
         REGEX "downloaded_packages" EXCLUDE
         REGEX "runtime" EXCLUDE
     )
@@ -463,19 +462,16 @@ function(ly_setup_others)
     install(DIRECTORY
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/Registry
         DESTINATION ./${runtime_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
     install(DIRECTORY
         ${LY_ROOT_FOLDER}/Registry
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # Engine Source Assets
     install(DIRECTORY
         ${LY_ROOT_FOLDER}/Assets
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # Gem Source Assets and Registry
@@ -495,7 +491,6 @@ function(ly_setup_others)
             # the "Assets" folder from being copied underneath the <gem-root>/Assets folder
             install(DIRECTORY ${gem_abs_assets_path}
                 DESTINATION ${gem_assets_path}
-                COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
             )
         endif()
     endforeach()
@@ -511,7 +506,6 @@ function(ly_setup_others)
         get_filename_component(gem_relative_path ${gem_json_path} DIRECTORY)
         install(FILES ${gem_json_path}
             DESTINATION ${gem_relative_path}
-            COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
         )
     endforeach()
 
@@ -519,14 +513,12 @@ function(ly_setup_others)
     install(DIRECTORY
         ${LY_ROOT_FOLDER}/Gems/Atom/Asset/ImageProcessingAtom/Config
         DESTINATION Gems/Atom/Asset/ImageProcessingAtom
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # Templates
     install(DIRECTORY
         ${LY_ROOT_FOLDER}/Templates
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
     # Misc
@@ -535,7 +527,6 @@ function(ly_setup_others)
         ${LY_ROOT_FOLDER}/LICENSE.txt
         ${LY_ROOT_FOLDER}/README.md
         DESTINATION .
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
 endfunction()
@@ -549,15 +540,12 @@ function(ly_setup_target_generator)
         ${LY_ROOT_FOLDER}/Code/LauncherUnified/LauncherProject.cpp
         ${LY_ROOT_FOLDER}/Code/LauncherUnified/StaticModules.in
         DESTINATION LauncherGenerator
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
     install(DIRECTORY ${LY_ROOT_FOLDER}/Code/LauncherUnified/Platform
         DESTINATION LauncherGenerator
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
     install(FILES ${LY_ROOT_FOLDER}/Code/LauncherUnified/FindLauncherGenerator.cmake
         DESTINATION cmake
-        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
 
 endfunction()

From 5695681ed3518d3e7c4ab7ed3aad92c4bb01d422 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 21:03:41 -0700
Subject: [PATCH 13/18] [cpack_installer] fifth attempt to fix cpack selection

---
 scripts/build/Platform/Windows/installer_windows.cmd | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index 73d1a3d88c..c71b091de9 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -29,22 +29,25 @@ IF NOT EXIST "%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%"=="" (
-    FOR /F %%i in ('where cpack') DO (
+    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!
-    exit /b 1
+    GOTO :popd_error
 )
 
 ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION%

From 602dd01434848ad04e32123e1dbd6d0aeb717824 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 22:02:11 -0700
Subject: [PATCH 14/18] [cpack_installer] fixed typo in error message

---
 cmake/Packaging.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 1bcb251271..e2aa0f9348 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -54,7 +54,7 @@ endif()
 if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION})
     message(FATAL_ERROR
         "The desired version of CMake to be included in the package is "
-        "is below the minium required version of CMake to run")
+        "is below the minimum required version of CMake to run")
 endif()
 
 # pull down the desired copy of CMake so it can be included in the package

From 881c51dc9c9ff3caa1f4b404c91e9cbaf74bd6ab Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 2 Jun 2021 22:05:20 -0700
Subject: [PATCH 15/18] [cpack_installer] removed unnecessary explicit use of
 CMAKE_INSTALL_DEFAULT_COMPONENT_NAME

---
 cmake/Packaging.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index e2aa0f9348..e5799c8ff1 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -101,7 +101,6 @@ endif()
 
 install(FILES ${_cmake_package_dest}
     DESTINATION ./Tools/Redistributables/CMake
-    COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
 )
 
 # IMPORTANT: required to be included AFTER setting all property overrides

From 328ced0059f90f66d740d97e2f50721c9724995f Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Thu, 3 Jun 2021 07:24:30 -0700
Subject: [PATCH 16/18] [cpack_installer] replaced missing get_target_property
 hack and fixed a typo

---
 cmake/Platform/Common/Install_common.cmake | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index e0301bb914..7e6917287f 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -27,11 +27,8 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
     # De-alias target name
     ly_de_alias_target(${ALIAS_TARGET_NAME} TARGET_NAME)
 
-    # get the component ID.  if the property isn't set for the target, fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
-    get_target_property(install_componet ${TARGET_NAME} INSTALL_COMPONENT)
-    if("${install_componet}" STREQUAL "install_componet-NOTFOUND")
-        unset(install_componet)
-    endif()
+    # get the component ID.  if the property isn't set for the target, it will auto fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
+    get_property(install_component TARGET ${TARGET_NAME} PROPERTY INSTALL_COMPONENT)
 
     # All include directories marked PUBLIC or INTERFACE will be installed. We dont use PUBLIC_HEADER because in order to do that
     # we need to set the PUBLIC_HEADER property of the target for all the headers we are exporting. After doing that, installing the
@@ -47,7 +44,7 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
                 unset(current_public_headers)
                 install(DIRECTORY ${include_directory}
                     DESTINATION ${include_location}/${target_source_dir}
-                    COMPONENT ${install_componet}
+                    COMPONENT ${install_component}
                     FILES_MATCHING
                         PATTERN *.h
                         PATTERN *.hpp
@@ -74,13 +71,13 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME)
         TARGETS ${TARGET_NAME}
         ARCHIVE
             DESTINATION ${archive_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>
-            COMPONENT ${install_componet}
+            COMPONENT ${install_component}
         LIBRARY
             DESTINATION ${library_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_library_output_subdirectory}
-            COMPONENT ${install_componet}
+            COMPONENT ${install_component}
         RUNTIME
             DESTINATION ${runtime_output_directory}/${PAL_PLATFORM_NAME}/$<CONFIG>/${target_runtime_output_subdirectory}
-            COMPONENT ${install_componet}
+            COMPONENT ${install_component}
     )
 
     # CMakeLists.txt file
@@ -188,7 +185,7 @@ set_property(TARGET ${TARGET_NAME}
     file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/install/${target_source_dir}/${NAME_PLACEHOLDER}_$<CONFIG>.cmake" CONTENT "${target_file_contents}")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/${target_source_dir}/${NAME_PLACEHOLDER}_$<CONFIG>.cmake"
         DESTINATION ${target_source_dir}
-        COMPONENT ${install_componet}
+        COMPONENT ${install_component}
     )
 
     # Since a CMakeLists.txt could contain multiple targets, we generate it in a folder per target
@@ -247,11 +244,11 @@ function(ly_setup_subdirectory absolute_target_source_dir)
     )
 
     # get the component ID.  if the property isn't set for the directory, it will auto fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
-    get_property(install_componet DIRECTORY ${absolute_target_source_dir} PROPERTY INSTALL_COMPONENT)
+    get_property(install_component DIRECTORY ${absolute_target_source_dir} PROPERTY INSTALL_COMPONENT)
 
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/install/${target_source_dir}/CMakeLists.txt"
         DESTINATION ${target_source_dir}
-        COMPONENT ${install_componet}
+        COMPONENT ${install_component}
     )
 
 endfunction()

From 8214706ff9ab2c49cfafc7164bb6dbe0d296112c Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Thu, 3 Jun 2021 08:24:01 -0700
Subject: [PATCH 17/18] [cpack_installer] reworked how packaging is enabled for
 windows

---
 cmake/Platform/Windows/Packaging_windows.cmake   | 10 ++--------
 scripts/build/Platform/Windows/build_config.json |  3 +--
 scripts/build/Platform/Windows/build_windows.cmd |  8 --------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 5210c24e7b..2fd281ad51 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -9,17 +9,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(LY_WIX_PATH "" CACHE PATH "Path to the WiX install path")
-
-if(LY_WIX_PATH)
-    file(TO_CMAKE_PATH ${LY_WIX_PATH} CPACK_WIX_ROOT)
-elseif(DEFINED ENV{WIX})
-    file(TO_CMAKE_PATH $ENV{WIX} CPACK_WIX_ROOT)
-endif()
+set(CPACK_WIX_ROOT "" CACHE PATH "Path to the WiX install path")
 
 if(CPACK_WIX_ROOT)
     if(NOT EXISTS ${CPACK_WIX_ROOT})
-        message(FATAL_ERROR "Invalid path supplied for LY_WIX_PATH argument or WIX environment variable")
+        message(FATAL_ERROR "Invalid path supplied for CPACK_WIX_ROOT argument")
     endif()
 else()
     # early out as no path to WiX has been supplied effectively disabling support
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index b0d16f1fb6..fc4668de0a 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -314,8 +314,7 @@
     "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",
-        "CMAKE_INCLUDE_WIX": "True",
+        "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"
diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index 799e6828b2..3e995e1905 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -38,14 +38,6 @@ IF NOT EXIST %TMP% (
 REM Compute half the amount of processors so some jobs can run
 SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
 
-IF "%CMAKE_INCLUDE_WIX%"=="True" (
-    REM Explicitly enable wix via command line arg for forensic logging
-    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
-) ELSE (
-    REM Disable implicit enabling of windows packing by clearing out the wix variable
-    SET WIX=
-)
-
 SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
 SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" -DLY_PROJECTS=%CMAKE_LY_PROJECTS%
 IF NOT EXIST CMakeCache.txt (

From bcef8856ff2143fa137078525d98d47ddc6fe348 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Thu, 3 Jun 2021 10:51:13 -0700
Subject: [PATCH 18/18] [cpack_installer] minor wording fixes

---
 cmake/Packaging.cmake                                | 2 +-
 scripts/build/Platform/Windows/installer_windows.cmd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index e5799c8ff1..3e23511fa1 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -54,7 +54,7 @@ endif()
 if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION})
     message(FATAL_ERROR
         "The desired version of CMake to be included in the package is "
-        "is below the minimum required version of CMake to run")
+        "below the minimum required version of CMake to run")
 endif()
 
 # pull down the desired copy of CMake so it can be included in the package
diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd
index c71b091de9..a6ce15d59e 100644
--- a/scripts/build/Platform/Windows/installer_windows.cmd
+++ b/scripts/build/Platform/Windows/installer_windows.cmd
@@ -20,7 +20,7 @@ IF NOT EXIST %OUTPUT_DIRECTORY% (
 )
 PUSHD %OUTPUT_DIRECTORY%
 
-REM Override the temporary directory used by wix to the EBS volume
+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%"