diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-05-31 23:39:46 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-05-31 23:39:46 (GMT) |
| commit | 773490099f243d91c0280b64462f1f9df4783392 (patch) | |
| tree | cf1832bc0c49eba00beec244c2e33b05d742ed5e | |
| parent | 83f34aa4f856201ac4fab3509707e012c1f984f8 (diff) | |
| download | cpython-773490099f243d91c0280b64462f1f9df4783392.zip cpython-773490099f243d91c0280b64462f1f9df4783392.tar.gz cpython-773490099f243d91c0280b64462f1f9df4783392.tar.bz2 | |
Issue #24317: Makes Customize page default to installing per-user, and switching to All Users enable CompileAll.
| -rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 6 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 0c40be5..62b9614 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -89,6 +89,7 @@ enum CONTROL_ID { ID_TARGETDIR_EDITBOX, ID_CUSTOM_ASSOCIATE_FILES_CHECKBOX, ID_CUSTOM_INSTALL_ALL_USERS_CHECKBOX, + ID_CUSTOM_COMPILE_ALL_CHECKBOX, ID_CUSTOM_BROWSE_BUTTON, ID_CUSTOM_BROWSE_BUTTON_LABEL, ID_CUSTOM_INSTALL_BUTTON, @@ -149,6 +150,7 @@ static THEME_ASSIGN_CONTROL_ID CONTROL_ID_NAMES[] = { { ID_TARGETDIR_EDITBOX, L"TargetDir" }, { ID_CUSTOM_ASSOCIATE_FILES_CHECKBOX, L"AssociateFiles" }, { ID_CUSTOM_INSTALL_ALL_USERS_CHECKBOX, L"InstallAllUsers" }, + { ID_CUSTOM_COMPILE_ALL_CHECKBOX, L"CompileAll" }, { ID_CUSTOM_BROWSE_BUTTON, L"CustomBrowseButton" }, { ID_CUSTOM_BROWSE_BUTTON_LABEL, L"CustomBrowseButtonLabel" }, { ID_CUSTOM_INSTALL_BUTTON, L"CustomInstallButton" }, @@ -372,6 +374,10 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { checked = ThemeIsControlChecked(_theme, ID_CUSTOM_INSTALL_ALL_USERS_CHECKBOX); ThemeControlElevates(_theme, ID_CUSTOM_INSTALL_BUTTON, checked && (FAILED(hr) || !elevated)); ThemeControlEnable(_theme, ID_CUSTOM_BROWSE_BUTTON_LABEL, !checked); + if (checked) { + _engine->SetVariableNumeric(L"CompileAll", 1); + ThemeSendControlMessage(_theme, ID_CUSTOM_COMPILE_ALL_CHECKBOX, BM_SETCHECK, BST_CHECKED, 0); + } ThemeGetTextControl(_theme, ID_TARGETDIR_EDITBOX, &targetDir); if (targetDir) { // Check the current value against the default to see diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index c8a7f5c..76e87ab 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -23,7 +23,7 @@ <Variable Name="ShortVersion" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)" /> <Variable Name="ShortVersionNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)" /> - <Variable Name="InstallAllUsers" Value="1" Persisted="yes" bal:Overridable="yes" /> + <Variable Name="InstallAllUsers" Value="0" Persisted="yes" bal:Overridable="yes" /> <Variable Name="TargetDir" Value="" Persisted="yes" bal:Overridable="yes" /> <?if $(var.Platform)~="x64" ?> <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]Python [ShortVersion]" bal:Overridable="yes" /> @@ -60,7 +60,7 @@ <Variable Name="AssociateFiles" Value="1" Persisted="yes" bal:Overridable="yes" /> <Variable Name="Shortcuts" Value="1" Persisted="yes" bal:Overridable="yes" /> <Variable Name="PrependPath" Value="0" Persisted="yes" bal:Overridable="yes" /> - <Variable Name="CompileAll" Value="1" Persisted="yes" bal:Overridable="yes" /> + <Variable Name="CompileAll" Value="0" Persisted="yes" bal:Overridable="yes" /> <Variable Name="SimpleInstall" Value="0" bal:Overridable="yes" /> |