diff options
| author | Steve Dower <steve.dower@python.org> | 2022-09-30 09:29:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 09:29:31 (GMT) |
| commit | ff54dd96cbe589635ed95c8b5b26bc768166b07d (patch) | |
| tree | 21e5a138537c434405d7666d50ace7089a707120 /Tools/msi | |
| parent | 73942e475c773ff844c231d98c9b37acdc678e9c (diff) | |
| download | cpython-ff54dd96cbe589635ed95c8b5b26bc768166b07d.zip cpython-ff54dd96cbe589635ed95c8b5b26bc768166b07d.tar.gz cpython-ff54dd96cbe589635ed95c8b5b26bc768166b07d.tar.bz2 | |
gh-90989: Install Windows launcher per-user, and clarify some installer text (GH-97655)
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/bundle/Default.wxl | 12 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Tools/msi/bundle/Default.wxl b/Tools/msi/bundle/Default.wxl index 8b2633f..e83a540 100644 --- a/Tools/msi/bundle/Default.wxl +++ b/Tools/msi/bundle/Default.wxl @@ -79,15 +79,15 @@ Select Customize to review current options.</String> <String Id="Include_launcherRemove">Use Programs and Features to remove the 'py' launcher.</String> <String Id="Include_launcherUpgrade">Upgrades the global 'py' launcher from the previous version.</String> - <String Id="AssociateFilesLabel">Associate &files with Python (requires the py launcher)</String> + <String Id="AssociateFilesLabel">Associate &files with Python (requires the 'py' launcher)</String> <String Id="ShortcutsLabel">Create shortcuts for installed applications</String> <String Id="PrependPathLabel">Add Python to &environment variables</String> - <String Id="ShortPrependPathLabel">Add &Python [ShortVersion] to PATH</String> + <String Id="ShortPrependPathLabel">Add &python.exe to PATH</String> <String Id="AppendPathLabel">Append Python to &environment variables</String> - <String Id="ShortAppendPathLabel">Append &Python [ShortVersion] to PATH</String> - <String Id="InstallAllUsersLabel">Install for &all users</String> - <String Id="InstallLauncherAllUsersLabel">for &all users (requires elevation)</String> - <String Id="ShortInstallLauncherAllUsersLabel">Install &launcher for all users (recommended)</String> + <String Id="ShortAppendPathLabel">Append &python.exe to PATH</String> + <String Id="InstallAllUsersLabel">Install Python [ShortVersion] for &all users</String> + <String Id="InstallLauncherAllUsersLabel">for &all users (requires admin privileges)</String> + <String Id="ShortInstallLauncherAllUsersLabel">Use admin privi&leges when installing py.exe</String> <String Id="PrecompileLabel">&Precompile standard library</String> <String Id="Include_symbolsLabel">Download debugging &symbols</String> <String Id="Include_debugLabel">Download debu&g binaries (requires VS 2017 or later)</String> diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index d23158c..8b12baa 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -28,7 +28,7 @@ <Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" /> <?if "$(var.PyTestExt)"="" ?> - <Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" /> + <Variable Name="InstallLauncherAllUsers" Value="0" bal:Overridable="yes" /> <?else ?> <Variable Name="InstallLauncherAllUsers" Value="0" /> <?endif ?> |