[pypy-commit] pypy windowsinstaller: Modify installer to remove customise button.

[andr...@siemens.com]

Author: andrew.lawrence at siemens.com
Branch: windowsinstaller
Changeset: r95821:bdb9d8ea6391
Date: 2019-01-06 21:01 +0000
http://bitbucket.org/pypy/pypy/changeset/bdb9d8ea6391/

Log:	Modify installer to remove customise button.

diff --git a/pypy/tool/release/windowsinstaller/bundle/Default.thm b/pypy/tool/release/windowsinstaller/bundle/Default.thm
--- a/pypy/tool/release/windowsinstaller/bundle/Default.thm
+++ b/pypy/tool/release/windowsinstaller/bundle/Default.thm
@@ -22,7 +22,6 @@
         <Text X="185" Y="50" Width="-11" Height="50" FontId="3" TabStop="yes">#(loc.InstallMessage)</Text>
 
         <Button Name="InstallButton" X="185" Y="101" Width="-11" Height="109" TabStop="yes" FontId="3" HexStyle="0xE">#(loc.InstallButton)</Button>
-        <Button Name="InstallCustomButton" X="185" Y="221" Width="-11" Height="59" TabStop="yes" FontId="3" HexStyle="0xE">#(loc.InstallCustomButton)</Button>
 
         <Checkbox Name="InstallLauncherAllUsers" X="185" Y="-37" Width="-100" Height="24" TabStop="yes" FontId="3">#(loc.ShortInstallLauncherAllUsersLabel)</Checkbox>
         <Checkbox Name="PrependPath" X="185" Y="-13" Width="-100" Height="24" TabStop="yes" FontId="3">#(loc.ShortPrependPathLabel)</Checkbox>
diff --git a/pypy/tool/release/windowsinstaller/bundle/Default.wxl b/pypy/tool/release/windowsinstaller/bundle/Default.wxl
--- a/pypy/tool/release/windowsinstaller/bundle/Default.wxl
+++ b/pypy/tool/release/windowsinstaller/bundle/Default.wxl
@@ -19,7 +19,7 @@
   <String Id="CancelButton">&Cancel</String>
   <String Id="CloseButton">&Close</String>
   <String Id="InstallHeader">Install [WixBundleName]</String>
-  <String Id="InstallMessage">Select Install Now to install PyPy with default settings, or choose Customize to enable or disable features.</String>
+  <String Id="InstallMessage">Select Install Now to install PyPy with default settings.</String>
   <String Id="InstallVersion">Version [WixBundleVersion]</String>
   <String Id="InstallUpgradeHeader">Upgrade to [WixBundleName]</String>
   <String Id="InstallUpgradeMessage">Select Upgrade Now to keep your current settings, or choose Customize to enable or disable features.</String>
@@ -44,7 +44,6 @@
   <String Id="InstallButton">&Install Now</String>
   <String Id="InstallButtonNote">[TargetDir]
 
-Includes IDLE, pip and documentation
 Creates shortcuts and file associations</String>
   <String Id="InstallCustomButton">C&ustomize installation</String>
   <String Id="InstallCustomButtonNote">Choose location and features</String>