diff options
| author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:16:58 -0800 |
|---|---|---|
| committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:16:58 -0800 |
| commit | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (patch) | |
| tree | 74845e2dbd9521d9748b9c32f1922f4123083bf3 /Tools/msi/common.wxs | |
| parent | e3c7e835bdfc97750eb9b7fc0ad2493108c2d438 (diff) | |
| parent | 1fe806ac56f8b83694d24ab604eb695d00bc8497 (diff) | |
| download | cpython-da79bcf8ac7ae72218ab023e1ed54390bc1a3a27.tar.gz | |
Issue #29371: merge with 3.5
Diffstat (limited to 'Tools/msi/common.wxs')
| -rw-r--r-- | Tools/msi/common.wxs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs index 4efad6562a..398d94a24d 100644 --- a/Tools/msi/common.wxs +++ b/Tools/msi/common.wxs @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> + <Property Id="ROOTREGISTRYKEY" Value="Software\Python\PythonCore" /> + </Fragment> + + <Fragment> <Property Id="REGISTRYKEY" Value="Software\Python\PythonCore\$(var.ShortVersion)$(var.PyArchExt)$(var.PyTestExt)" /> </Fragment> @@ -16,10 +20,12 @@ <Fragment> <Property Id="UpgradeTable" Value="1" /> + <?ifndef SuppressUpgradeTable ?> <Upgrade Id="$(var.UpgradeCode)"> <UpgradeVersion Property="DOWNGRADE" Minimum="$(var.Version)" IncludeMinimum="no" OnlyDetect="yes" /> <UpgradeVersion Property="UPGRADE" Minimum="$(var.UpgradeMinimumVersion)" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="no" /> </Upgrade> + <?endif ?> <?ifdef CoreUpgradeCode ?> <?if $(var.UpgradeCode)!=$(var.CoreUpgradeCode) ?> @@ -40,7 +46,7 @@ <Fragment> <!-- Include an icon for the Programs and Features dialog --> - <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\pycon.ico" /> + <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\python.ico" /> <Property Id="ARPPRODUCTICON" Value="ARPIcon" /> <Property Id="ARPNOMODIFY" Value="1" /> <Property Id="DISABLEADVTSHORTCUTS" Value="1" /> @@ -57,7 +63,9 @@ <!-- Top-level directories --> <Fragment> <DirectoryRef Id="InstallDirectory"> - <Directory Id="DLLs" Name="DLLs" /> + <Directory Id="DLLs" Name="DLLs"> + <Directory Id="Catalogs" /> + </Directory> </DirectoryRef> </Fragment> |