From 60f38b0c304d97ba8da53dcabfb9641cecd80fd7 Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Wed, 30 Jun 2021 11:19:52 -0700
Subject: [PATCH] [cpack/2106-install-path] update default install path and
 provide warning about 'Program Files'

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 cmake/Platform/Windows/Packaging/Bootstrapper.wxs         | 2 +-
 cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in | 2 ++
 cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index 847fcdad0c..6971e32ca2 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -14,7 +14,7 @@
 
         <Variable Name="InstallFolder"
             Type="string"
-            Value="[ProgramFiles64Folder]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
+            Value="[WindowsVolume]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
             bal:Overridable="yes"/>
 
         <!-- special variable name that auto maps to a WixStandardBootstrapperApplication attribute of the same name -->
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
index 0c532fa4d8..6c5d16fd49 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -22,6 +22,8 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
     <String Id="OptionsHeader">Setup Options</String>
     <String Id="OptionsLocationLabel">Install location:</String>
     <String Id="OptionsBrowseButton">&amp;Browse</String>
+    <String Id="OptionsWarningTitle">WARNING:</String>
+    <String Id="OptionsWarning">Installing to "Program Files" will require [WixBundleName] and its tools to be run with elevated privileges</String>
     <String Id="OptionsOkButton">&amp;OK</String>
     <String Id="OptionsCancelButton">&amp;Cancel</String>
 
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 62980a35f7..8d8416539e 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -11,6 +11,8 @@
     <Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font>
     <!-- throwaway font for button bar -->
     <Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Open Sans</Font>
+    <!-- special font for install warning title -->
+    <Font Id="4" Height="-14" Weight="500" Foreground="000000">Open Sans</Font>
 
     <!-- top banner -->
     <Image X="28" Y="24" Width="168" Height="64" ImageFile="logo.png" Visible="yes"/>
@@ -34,6 +36,8 @@
         <Text X="42" Y="202" Width="-42" Height="18" FontId="1" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
         <Editbox Name="FolderEditbox" X="42" Y="231" Width="354" Height="21" TabStop="yes" FontId="1" FileSystemAutoComplete="yes" />
         <Button Name="BrowseButton" X="406" Y="230" Width="80" Height="23" TabStop="yes" FontId="1">#(loc.OptionsBrowseButton)</Button>
+        <Text X="42" Y="262" Width="-42" Height="20" FontId="4" DisablePrefix="yes">#(loc.OptionsWarningTitle)</Text>
+        <Text X="42" Y="282" Width="-42" Height="54" FontId="1" DisablePrefix="yes">#(loc.OptionsWarning)</Text>
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
         <Button Name="OptionsOkButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>