diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-16 23:33:55 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-16 23:33:55 (GMT) |
| commit | 2237bdc595e3d33f941c40108eddfa262c19d960 (patch) | |
| tree | 174fef339e6a87b1d4cab69f631dacf16abfe45b /Tools/msi/bundle/packagegroups | |
| parent | 8cc80f1d8199a29a432c8caeb3142f9aa35012fd (diff) | |
| download | cpython-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 'Tools/msi/bundle/packagegroups')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/launcher.wxs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/bundle/packagegroups/launcher.wxs b/Tools/msi/bundle/packagegroups/launcher.wxs index d09175f..77c6ac5 100644 --- a/Tools/msi/bundle/packagegroups/launcher.wxs +++ b/Tools/msi/bundle/packagegroups/launcher.wxs @@ -9,7 +9,7 @@ DownloadUrl="$(var.DownloadUrl)" ForcePerMachine="yes" EnableFeatureSelection="yes" - InstallCondition="InstallAllUsers and Include_launcher" /> + InstallCondition="(InstallAllUsers or InstallLauncherAllUsers) and Include_launcher" /> <MsiPackage Id="launcher_JustForMe" SourceFile="launcher.msi" @@ -17,7 +17,7 @@ DownloadUrl="$(var.DownloadUrl)" ForcePerMachine="no" EnableFeatureSelection="yes" - InstallCondition="not InstallAllUsers and Include_launcher" /> + InstallCondition="not (InstallAllUsers or InstallLauncherAllUsers) and Include_launcher" /> </PackageGroup> </Fragment> </Wix>
\ No newline at end of file |