birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cpack/2106-install-path] update default install path and provide warning about 'Program Files'

Browse Source 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
This commit is contained in:
AMZN-ScottR
2021-06-30 11:19:52 -07:00
parent 9c3ebeba04
commit 60f38b0c30
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+1 -1
View File
@@ -14,7 +14,7 @@
<Variable Name="InstallFolder" <Variable Name="InstallFolder"
Type="string" Type="string"
Value="[ProgramFiles64Folder]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)" Value="[WindowsVolume]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
bal:Overridable="yes"/> bal:Overridable="yes"/>
<!-- special variable name that auto maps to a WixStandardBootstrapperApplication attribute of the same name --> <!-- special variable name that auto maps to a WixStandardBootstrapperApplication attribute of the same name -->
cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+2
View File
@@ -22,6 +22,8 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
<String Id="OptionsHeader">Setup Options</String> <String Id="OptionsHeader">Setup Options</String>
<String Id="OptionsLocationLabel">Install location:</String> <String Id="OptionsLocationLabel">Install location:</String>
<String Id="OptionsBrowseButton">&amp;Browse</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="OptionsOkButton">&amp;OK</String>
<String Id="OptionsCancelButton">&amp;Cancel</String> <String Id="OptionsCancelButton">&amp;Cancel</String>
cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+4
View File
@@ -11,6 +11,8 @@
<Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font> <Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font>
<!-- throwaway font for button bar --> <!-- throwaway font for button bar -->
<Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Open Sans</Font> <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 --> <!-- top banner -->
<Image X="28" Y="24" Width="168" Height="64" ImageFile="logo.png" Visible="yes"/> <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> <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" /> <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> <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" /> <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> <Button Name="OptionsOkButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>