summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-07-16 23:33:55 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-07-16 23:33:55 (GMT)
commit2237bdc595e3d33f941c40108eddfa262c19d960 (patch)
tree174fef339e6a87b1d4cab69f631dacf16abfe45b /Doc/using
parent8cc80f1d8199a29a432c8caeb3142f9aa35012fd (diff)
downloadcpython-2237bdc595e3d33f941c40108eddfa262c19d960.zip
cpython-2237bdc595e3d33f941c40108eddfa262c19d960.tar.gz
cpython-2237bdc595e3d33f941c40108eddfa262c19d960.tar.bz2
Adds option to install launcher for all users even when installing Python just-for-me. This helps mitigate issues when the incompatible Python 3.4 launcher is installed.
Enables installer builds with the the text marker. Allows simple installs to include a custom description.
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/win_installer.pngbin46563 -> 48953 bytes
-rw-r--r--Doc/using/windows.rst12
2 files changed, 10 insertions, 2 deletions
diff --git a/Doc/using/win_installer.png b/Doc/using/win_installer.png
index 8e25892..e5d5e07 100644
--- a/Doc/using/win_installer.png
+++ b/Doc/using/win_installer.png
Binary files differ
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 8e3c110..213912f 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -130,6 +130,9 @@ of available options is shown below.
+---------------------------+--------------------------------------+--------------------------+
| Include_launcher | Install :ref:`launcher`. | 1 |
+---------------------------+--------------------------------------+--------------------------+
+| InstallLauncherAllUsers | Installs :ref:`launcher` for all | 1 |
+| | users. | |
++---------------------------+--------------------------------------+--------------------------+
| Include_lib | Install standard library and | 1 |
| | extension modules | |
+---------------------------+--------------------------------------+--------------------------+
@@ -145,6 +148,9 @@ of available options is shown below.
+---------------------------+--------------------------------------+--------------------------+
| SimpleInstall | Disable most install UI | 0 |
+---------------------------+--------------------------------------+--------------------------+
+| SimpleInstallDescription | A custom message to display when the | (empty) |
+| | simplified install UI is used. | |
++---------------------------+--------------------------------------+--------------------------+
For example, to silently install a default, system-wide Python installation,
you could use the following command (from an elevated command prompt)::
@@ -152,9 +158,11 @@ you could use the following command (from an elevated command prompt)::
python-3.5.0.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0
To allow users to easily install a personal copy of Python without the test
-suite, you could provide a shortcut with the following command::
+suite, you could provide a shortcut with the following command. This will
+display a simplified initial page and disallow customization::
- python-3.5.0.exe /passive InstallAllUsers=0 Include_launcher=0 Include_test=0 SimpleInstall=1
+ python-3.5.0.exe InstallAllUsers=0 Include_launcher=0 Include_test=0
+ SimpleInstall=1 SimpleInstallDescription="Just for me, no test suite."
(Note that omitting the launcher also omits file associations, and is only
recommended for per-user installs when there is also a system-wide installation