diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-14 17:36:36 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-14 17:36:36 (GMT) |
| commit | bc94fd7b4965369dd7fc9921db4269ae6b7fb7f2 (patch) | |
| tree | c2a39fd49b54e7fc0d9b616e4802d4b0d07602b7 /Tools/msi/bundle/packagegroups | |
| parent | 992ec46acc1267729da141f683f2594f00ba9f57 (diff) | |
| download | cpython-bc94fd7b4965369dd7fc9921db4269ae6b7fb7f2.zip cpython-bc94fd7b4965369dd7fc9921db4269ae6b7fb7f2.tar.gz cpython-bc94fd7b4965369dd7fc9921db4269ae6b7fb7f2.tar.bz2 | |
Issue #25164: Changes default all-users install directory to match per-user directory.
Diffstat (limited to 'Tools/msi/bundle/packagegroups')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/packageinstall.wxs | 4 | ||||
| -rw-r--r-- | Tools/msi/bundle/packagegroups/postinstall.wxs | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Tools/msi/bundle/packagegroups/packageinstall.wxs b/Tools/msi/bundle/packagegroups/packageinstall.wxs index 249d761..e5e7d4d 100644 --- a/Tools/msi/bundle/packagegroups/packageinstall.wxs +++ b/Tools/msi/bundle/packagegroups/packageinstall.wxs @@ -12,8 +12,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllDescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -m pip install requests-2.7.0-py2.py3-none-any.whl' - UninstallCommand='-$(var.ShortVersion)$(var.Suffix32) -m pip uninstall -y requests' + InstallCommand='-[WinVer] -m pip install requests-2.7.0-py2.py3-none-any.whl' + UninstallCommand='-[WinVer] -m pip uninstall -y requests' Vital="no" InstallCondition="Include_pip and not LauncherOnly"> <Payload SourceFile="requests-2.7.0-py2.py3-none-any.whl" diff --git a/Tools/msi/bundle/packagegroups/postinstall.wxs b/Tools/msi/bundle/packagegroups/postinstall.wxs index 90627b9..11ab673 100644 --- a/Tools/msi/bundle/packagegroups/postinstall.wxs +++ b/Tools/msi/bundle/packagegroups/postinstall.wxs @@ -26,8 +26,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllDescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)' - RepairCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)' + InstallCommand='-[WinVer] $(var.CompileAllCommand)' + RepairCommand='-[WinVer] $(var.CompileAllCommand)' Permanent="yes" PerMachine="yes" Vital="no" @@ -36,8 +36,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllODescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)' - RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)' + InstallCommand='-[WinVer] -O $(var.CompileAllCommand)' + RepairCommand='-[WinVer] -O $(var.CompileAllCommand)' Permanent="yes" PerMachine="yes" Vital="no" @@ -46,8 +46,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllOODescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)' - RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)' + InstallCommand='-[WinVer] -OO $(var.CompileAllCommand)' + RepairCommand='-[WinVer] -OO $(var.CompileAllCommand)' Permanent="yes" PerMachine="yes" Vital="no" @@ -57,8 +57,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllDescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)' - RepairCommand='-$(var.ShortVersion)$(var.Suffix32) $(var.CompileAllCommand)' + InstallCommand='-[WinVer] $(var.CompileAllCommand)' + RepairCommand='-[WinVer] $(var.CompileAllCommand)' Permanent="yes" PerMachine="no" Vital="no" @@ -67,8 +67,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllODescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)' - RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -O $(var.CompileAllCommand)' + InstallCommand='-[WinVer] -O $(var.CompileAllCommand)' + RepairCommand='-[WinVer] -O $(var.CompileAllCommand)' Permanent="yes" PerMachine="no" Vital="no" @@ -77,8 +77,8 @@ SourceFile="py.exe" Compressed="yes" DisplayName="!(loc.CompileAllOODescription)" - InstallCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)' - RepairCommand='-$(var.ShortVersion)$(var.Suffix32) -OO $(var.CompileAllCommand)' + InstallCommand='-[WinVer] -OO $(var.CompileAllCommand)' + RepairCommand='-[WinVer] -OO $(var.CompileAllCommand)' Permanent="yes" PerMachine="no" Vital="no" |