diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-05-18 22:54:05 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-05-18 22:54:05 (GMT) |
| commit | 4962141804676b34c372c8d6941eaf8edab3bfce (patch) | |
| tree | 5bc3250ab83ff8716fc55bb8b5cfbb2f61c92eb9 /Tools/msi/common.wxs | |
| parent | 1cea70f08c0b6aa3fccb246416b367e9afc1932a (diff) | |
| download | cpython-4962141804676b34c372c8d6941eaf8edab3bfce.zip cpython-4962141804676b34c372c8d6941eaf8edab3bfce.tar.gz cpython-4962141804676b34c372c8d6941eaf8edab3bfce.tar.bz2 | |
Removes versioning from py.exe launcher installer and ensures that old launchers are replaced by newer ones.
Diffstat (limited to 'Tools/msi/common.wxs')
| -rw-r--r-- | Tools/msi/common.wxs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs index b907872..4efad65 100644 --- a/Tools/msi/common.wxs +++ b/Tools/msi/common.wxs @@ -21,8 +21,8 @@ <UpgradeVersion Property="UPGRADE" Minimum="$(var.UpgradeMinimumVersion)" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="no" /> </Upgrade> + <?ifdef CoreUpgradeCode ?> <?if $(var.UpgradeCode)!=$(var.CoreUpgradeCode) ?> - <?ifndef SkipMissingCore ?> <Upgrade Id="$(var.CoreUpgradeCode)"> <UpgradeVersion Property="MISSING_CORE" Minimum="$(var.Version)" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="yes" OnlyDetect="yes" /> </Upgrade> @@ -47,9 +47,11 @@ </Fragment> <Fragment> + <?ifdef InstallDirectoryGuidSeed ?> <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="InstallDirectory" ComponentGuidGenerationSeed="$(var.InstallDirectoryGuidSeed)" /> </Directory> + <?endif ?> </Fragment> <!-- Top-level directories --> |