Skip to content

Commit

Permalink
gh-90989: Install Windows launcher per-user, and clarify some install…
Browse files Browse the repository at this point in the history
…er text (GH-97655)
  • Loading branch information
zooba authored Sep 30, 2022
1 parent 73942e4 commit ff54dd9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Made :ref:`launcher` install per-user by default (unless an all users
install already exists), and clarify some text in the installer.
12 changes: 6 additions & 6 deletions Tools/msi/bundle/Default.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -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 &amp;files with Python (requires the py launcher)</String>
<String Id="AssociateFilesLabel">Associate &amp;files with Python (requires the 'py' launcher)</String>
<String Id="ShortcutsLabel">Create shortcuts for installed applications</String>
<String Id="PrependPathLabel">Add Python to &amp;environment variables</String>
<String Id="ShortPrependPathLabel">Add &amp;Python [ShortVersion] to PATH</String>
<String Id="ShortPrependPathLabel">Add &amp;python.exe to PATH</String>
<String Id="AppendPathLabel">Append Python to &amp;environment variables</String>
<String Id="ShortAppendPathLabel">Append &amp;Python [ShortVersion] to PATH</String>
<String Id="InstallAllUsersLabel">Install for &amp;all users</String>
<String Id="InstallLauncherAllUsersLabel">for &amp;all users (requires elevation)</String>
<String Id="ShortInstallLauncherAllUsersLabel">Install &amp;launcher for all users (recommended)</String>
<String Id="ShortAppendPathLabel">Append &amp;python.exe to PATH</String>
<String Id="InstallAllUsersLabel">Install Python [ShortVersion] for &amp;all users</String>
<String Id="InstallLauncherAllUsersLabel">for &amp;all users (requires admin privileges)</String>
<String Id="ShortInstallLauncherAllUsersLabel">Use admin privi&amp;leges when installing py.exe</String>
<String Id="PrecompileLabel">&amp;Precompile standard library</String>
<String Id="Include_symbolsLabel">Download debugging &amp;symbols</String>
<String Id="Include_debugLabel">Download debu&amp;g binaries (requires VS 2017 or later)</String>
Expand Down
2 changes: 1 addition & 1 deletion Tools/msi/bundle/bundle.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?>
Expand Down

0 comments on commit ff54dd9

Please sign in to comment.