From 9788caa6cb2b81f92c97f34d1683f5cfa2a52f54 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Wed, 19 May 2021 13:48:02 -0700
Subject: [PATCH] [cpack_installer] move non-cmake packaging resources into
 their own folder

---
 .../{PackagingBootstrapper.wxs => Packaging/Bootstrapper.wxs} | 0
 .../{PackagingTemplate.wxs.in => Packaging/Template.wxs.in}   | 0
 cmake/Platform/Windows/PackagingPostBuild.cmake               | 2 +-
 cmake/Platform/Windows/Packaging_windows.cmake                | 2 +-
 cmake/Platform/Windows/platform_windows_files.cmake           | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename cmake/Platform/Windows/{PackagingBootstrapper.wxs => Packaging/Bootstrapper.wxs} (100%)
 rename cmake/Platform/Windows/{PackagingTemplate.wxs.in => Packaging/Template.wxs.in} (100%)

diff --git a/cmake/Platform/Windows/PackagingBootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
similarity index 100%
rename from cmake/Platform/Windows/PackagingBootstrapper.wxs
rename to cmake/Platform/Windows/Packaging/Bootstrapper.wxs
diff --git a/cmake/Platform/Windows/PackagingTemplate.wxs.in b/cmake/Platform/Windows/Packaging/Template.wxs.in
similarity index 100%
rename from cmake/Platform/Windows/PackagingTemplate.wxs.in
rename to cmake/Platform/Windows/Packaging/Template.wxs.in
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index 3ba6ef2096..dbc54528b6 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -43,7 +43,7 @@ set(_candle_command
     "-I${_cpack_wix_out_dir}" # to include cpack_variables.wxi
     ${_addtional_defines}
     ${_ext_flags}
-    "${CPACK_SOURCE_DIR}/Platform/Windows/PackagingBootstrapper.wxs"
+    "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Bootstrapper.wxs"
     -o "${_bootstrap_out_dir}/"
 )
 
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 2ea35c1d9b..3b99992ad3 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -78,7 +78,7 @@ endif()
 set(CPACK_WIX_PRODUCT_GUID ${LY_WIX_PRODUCT_GUID})
 set(CPACK_WIX_UPGRADE_GUID ${LY_WIX_UPGRADE_GUID})
 
-set(CPACK_WIX_TEMPLATE "${CPACK_SOURCE_DIR}/Platform/Windows/PackagingTemplate.wxs.in")
+set(CPACK_WIX_TEMPLATE "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Template.wxs.in")
 
 set(_embed_artifacts "yes")
 
diff --git a/cmake/Platform/Windows/platform_windows_files.cmake b/cmake/Platform/Windows/platform_windows_files.cmake
index 84d1a3098c..b760a8760d 100644
--- a/cmake/Platform/Windows/platform_windows_files.cmake
+++ b/cmake/Platform/Windows/platform_windows_files.cmake
@@ -24,7 +24,7 @@ set(FILES
     PALDetection_windows.cmake
     Install_windows.cmake
     Packaging_windows.cmake
-    PackagingBootstrapper.wxs
     PackagingPostBuild.cmake
-    PackagingTemplate.wxs.in
+    Packaging/Bootstrapper.wxs
+    Packaging/Template.wxs.in
 )