From b089facc232ec020c7566077c3440a5fc03221f3 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Sun, 20 Jun 2021 20:00:23 -0700
Subject: [PATCH] [cpack/jenkins-main] fixed bug where some resources were not
 embedded in the bootstrapper

---
 cmake/Platform/Windows/Packaging/Bootstrapper.wxs         | 8 ++++++++
 cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in | 2 +-
 cmake/Platform/Windows/PackagingPostBuild.cmake           | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index c7146b1b7f..cb9d86ede8 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -17,6 +17,10 @@
             Value="[ProgramFiles64Folder]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
             bal:Overridable="yes"/>
 
+        <PayloadGroup Id="Images">
+            <Payload Id="warning.png" SourceFile="$(var.CPACK_RESOURCE_PATH)/warning.png" Compressed="yes"/>
+        </PayloadGroup>
+
         <?ifdef CPACK_LICENSE_URL?>
             <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
                 <bal:WixStandardBootstrapperApplication
@@ -25,6 +29,8 @@
                     ThemeFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).xml"
                     LocalizationFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).wxl"
                     ShowVersion="yes" />
+
+                <PayloadGroupRef Id="Images"/>
             </BootstrapperApplicationRef>
         <?else?>
             <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
@@ -34,6 +40,8 @@
                     ThemeFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).xml"
                     LocalizationFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).wxl"
                     ShowVersion="yes" />
+
+                <PayloadGroupRef Id="Images"/>
             </BootstrapperApplicationRef>
         <?endif?>
 
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index f9a177b646..93984d06b8 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -76,7 +76,7 @@
 
     <!-- final page (failure state) -->
     <Page Name="Failure">
-        <Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@"/>
+        <Image X="38" Y="132" Width="42" Height="42" ImageFile="warning.png"/>
         <Text Name="FailureHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
         <Text Name="FailureInstallHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
         <Text Name="FailureUninstallHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index 89c9837cf5..83dff8354e 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -32,6 +32,7 @@ set(_addtional_defines
     -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME}
     -dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir}
     -dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO}
+    -dCPACK_RESOURCE_PATH=${CPACK_SOURCE_DIR}/Platform/Windows/Packaging
 )
 
 if(CPACK_LICENSE_URL)