From b45d01919dac7e4ff096f58ab81c422e99d4faa6 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Tue, 18 May 2021 00:22:17 -0700
Subject: [PATCH] [cpack_installer] simplify guid generation by using existing
 project props instead of timestamp in seed value. add bootstrapper specific
 guids.

---
 .../Windows/PackagingBootstrapper.wxs         |  2 +-
 .../Platform/Windows/PackagingPostBuild.cmake |  1 +
 .../Platform/Windows/Packaging_windows.cmake  | 42 ++++++++-----------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/cmake/Platform/Windows/PackagingBootstrapper.wxs b/cmake/Platform/Windows/PackagingBootstrapper.wxs
index f231f05413..c3d1dd7a7b 100644
--- a/cmake/Platform/Windows/PackagingBootstrapper.wxs
+++ b/cmake/Platform/Windows/PackagingBootstrapper.wxs
@@ -8,7 +8,7 @@
     <Bundle Name="$(var.CPACK_PACKAGE_NAME) $(var.CPACK_PACKAGE_VERSION)"
         Version="$(var.CPACK_PACKAGE_VERSION)"
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
-        UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)"
+        UpgradeCode="$(var.CPACK_BOOTSTRAP_UPGRADE_GUID)"
         DisableModify="yes">
 
         <Variable Name="InstallFolder"
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index cfed90e155..3ba6ef2096 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -25,6 +25,7 @@ set(_ext_flags
 )
 
 set(_addtional_defines
+    -dCPACK_BOOTSTRAP_UPGRADE_GUID=${CPACK_WIX_BOOTSTRAP_UPGRADE_GUID}
     -dCPACK_DOWNLOAD_SITE=${CPACK_DOWNLOAD_SITE}
     -dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir}
     -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME}
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 4044450d4c..2ea35c1d9b 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -30,34 +30,23 @@ set(CPACK_GENERATOR "WIX")
 
 # CPack will generate the WiX product/upgrade GUIDs further down the chain if they weren't supplied
 # however, they are unique for each run.  instead, let's do the auto generation here and add it to
-# the cache for run persistence.  an additional cache file will be used to store the information on
-# the original generation so we still have the ability to detect if they are still being used.
-set(_guid_cache_file "${CMAKE_BINARY_DIR}/CPackWiXConfig.cmake")
-if(NOT EXISTS ${_guid_cache_file})
-    set(_wix_guid_namespace "6D43F57A-2917-4AD9-B758-1F13CDB08593")
+# the cache for run persistence and have the ability to detect if they are still being used.
+set(_wix_guid_namespace "6D43F57A-2917-4AD9-B758-1F13CDB08593")
 
-    # based the ISO-8601 standard (YYYY-MM-DDTHH-mm-ssTZD) e.g., 20210506145533
-    string(TIMESTAMP _guid_gen_timestamp "%Y%m%d%H%M%S")
-
-    file(WRITE ${_guid_cache_file} "set(_wix_guid_gen_timestamp ${_guid_gen_timestamp})\n")
-
-    string(UUID _default_product_guid
+function(generate_wix_guid out_value seed)
+    string(UUID _guid
         NAMESPACE ${_wix_guid_namespace}
-        NAME "ProductID_${_guid_gen_timestamp}"
+        NAME ${seed}
         TYPE SHA1
         UPPER
     )
-    file(APPEND ${_guid_cache_file} "set(_wix_default_product_guid ${_default_product_guid})\n")
 
-    string(UUID _default_upgrade_guid
-        NAMESPACE ${_wix_guid_namespace}
-        NAME "UpgradeCode_${_guid_gen_timestamp}"
-        TYPE SHA1
-        UPPER
-    )
-    file(APPEND ${_guid_cache_file} "set(_wix_default_upgrade_guid ${_default_upgrade_guid})\n")
-endif()
-include(${_guid_cache_file})
+    set(${out_value} ${_guid} PARENT_SCOPE)
+endfunction()
+
+set(_guid_seed_base "${PROJECT_NAME}_${LY_VERSION_STRING}")
+generate_wix_guid(_wix_default_product_guid "${_guid_seed_base}_ProductID" )
+generate_wix_guid(_wix_default_upgrade_guid "${_guid_seed_base}_UpgradeCode")
 
 set(LY_WIX_PRODUCT_GUID "${_wix_default_product_guid}" CACHE STRING "GUID for the Product ID field. Format: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX")
 set(LY_WIX_UPGRADE_GUID "${_wix_default_upgrade_guid}" CACHE STRING "GUID for the Upgrade Code field. Format: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX")
@@ -91,10 +80,13 @@ set(CPACK_WIX_UPGRADE_GUID ${LY_WIX_UPGRADE_GUID})
 
 set(CPACK_WIX_TEMPLATE "${CPACK_SOURCE_DIR}/Platform/Windows/PackagingTemplate.wxs.in")
 
-set(_embed_artifacts_value yes)
+set(_embed_artifacts "yes")
 
 if(LY_INSTALLER_DOWNLOAD_URL)
-    set(_embed_artifacts_value no)
+    set(_embed_artifacts "no")
+
+    # the bootstrapper will at the very least need a different upgrade guid
+    generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode")
 
     set(CPACK_POST_BUILD_SCRIPTS
         ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPostBuild.cmake
@@ -102,5 +94,5 @@ if(LY_INSTALLER_DOWNLOAD_URL)
 endif()
 
 set(CPACK_WIX_CANDLE_EXTRA_FLAGS
-    -dCPACK_EMBED_ARTIFACTS=${_embed_artifacts_value}
+    -dCPACK_EMBED_ARTIFACTS=${_embed_artifacts}
 )