diff options
Diffstat (limited to 'Tools/msi/launcher')
| -rw-r--r-- | Tools/msi/launcher/launcher.wixproj | 2 | ||||
| -rw-r--r-- | Tools/msi/launcher/launcher.wxs | 16 | ||||
| -rw-r--r-- | Tools/msi/launcher/launcher_en-US.wxl | 1 | ||||
| -rw-r--r-- | Tools/msi/launcher/launcher_reg.wxs | 8 |
4 files changed, 19 insertions, 8 deletions
diff --git a/Tools/msi/launcher/launcher.wixproj b/Tools/msi/launcher/launcher.wixproj index 01a9dcb29e..8935ce88a7 100644 --- a/Tools/msi/launcher/launcher.wixproj +++ b/Tools/msi/launcher/launcher.wixproj @@ -5,7 +5,7 @@ <SchemaVersion>2.0</SchemaVersion> <OutputName>launcher</OutputName> <OutputType>Package</OutputType> - <DefineConstants>UpgradeCode=1B68A0EC-4DD3-5134-840E-73854B0863F1;$(DefineConstants)</DefineConstants> + <DefineConstants>UpgradeCode=1B68A0EC-4DD3-5134-840E-73854B0863F1;SuppressUpgradeTable=1;$(DefineConstants)</DefineConstants> <IgnoreCommonWxlTemplates>true</IgnoreCommonWxlTemplates> <SuppressICEs>ICE80</SuppressICEs> </PropertyGroup> diff --git a/Tools/msi/launcher/launcher.wxs b/Tools/msi/launcher/launcher.wxs index ebd875cd9a..7de131a3ed 100644 --- a/Tools/msi/launcher/launcher.wxs +++ b/Tools/msi/launcher/launcher.wxs @@ -5,7 +5,10 @@ <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> <Property Id="Suppress_TARGETDIR_Check" Value="1" /> - <PropertyRef Id="ARPPRODUCTICON" /> + <Icon Id="ARPIcon" SourceFile="!(bindpath.src)PC\icons\launcher.ico" /> + <Property Id="ARPPRODUCTICON" Value="ARPIcon" /> + <Property Id="ARPNOMODIFY" Value="1" /> + <Property Id="DISABLEADVTSHORTCUTS" Value="1" /> <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> <ComponentGroupRef Id="launcher_exe" Primary="yes" /> @@ -26,18 +29,21 @@ <Custom Before="SetLauncherInstallDirectoryLM" Action="SetLauncherInstallDirectoryCU">NOT Installed AND NOT ALLUSERS=1</Custom> <Custom Before="CostFinalize" Action="SetLauncherInstallDirectoryLM">NOT Installed AND ALLUSERS=1</Custom> - <RemoveExistingProducts After="InstallValidate">UPGRADE or REMOVE_350_LAUNCHER</RemoveExistingProducts> + <RemoveExistingProducts After="InstallValidate">UPGRADE or REMOVE_350_LAUNCHER or REMOVE_360A1_LAUNCHER</RemoveExistingProducts> </InstallExecuteSequence> + <!-- Upgrade all versions of the launcher --> + <Upgrade Id="$(var.UpgradeCode)"> + <UpgradeVersion Property="DOWNGRADE" Minimum="$(var.Version)" IncludeMinimum="no" OnlyDetect="yes" /> + <UpgradeVersion Property="UPGRADE" Minimum="0.0.0.0" IncludeMinimum="yes" Maximum="$(var.Version)" IncludeMaximum="no" /> + </Upgrade> <!-- Python 3.5.0 shipped with a different UpgradeCode --> <Upgrade Id="A71530B9-E89D-53DB-9C2D-C6D7551876D8"> <UpgradeVersion Minimum="0.0.0.0" Property="REMOVE_350_LAUNCHER" /> </Upgrade> <!-- Python 3.6.0a1 shipped with a different UpgradeCode --> <Upgrade Id="394750C0-7880-5A8F-999F-933965FBCFB4"> - <UpgradeVersion Maximum="$(var.Version)" Property="REMOVE_360A1_LAUNCHER" /> - <UpgradeVersion Minimum="$(var.Version)" Property="BLOCK_360A1_LAUNCHER" /> + <UpgradeVersion Minimum="0.0.0.0" Property="REMOVE_360A1_LAUNCHER" /> </Upgrade> - <Condition Message="!(loc.NoDowngrade)">Installed OR NOT BLOCK_360A1_LAUNCHER</Condition> </Product> </Wix> diff --git a/Tools/msi/launcher/launcher_en-US.wxl b/Tools/msi/launcher/launcher_en-US.wxl index e4c1aaa9fa..a7e3827c52 100644 --- a/Tools/msi/launcher/launcher_en-US.wxl +++ b/Tools/msi/launcher/launcher_en-US.wxl @@ -11,6 +11,7 @@ <String Id="PythonFileDescription">Python File</String> <String Id="PythonNoConFileDescription">Python File (no console)</String> <String Id="PythonCompiledFileDescription">Compiled Python File</String> + <String Id="PythonExtensionDescription">Python Extension Module</String> <String Id="PythonArchiveFileDescription">Python Zip Application File</String> <String Id="PythonNoConArchiveFileDescription">Python Zip Application File (no console)</String> </WixLocalization> diff --git a/Tools/msi/launcher/launcher_reg.wxs b/Tools/msi/launcher/launcher_reg.wxs index 981961ab0d..dace97ee58 100644 --- a/Tools/msi/launcher/launcher_reg.wxs +++ b/Tools/msi/launcher/launcher_reg.wxs @@ -27,14 +27,18 @@ </ProgId> <RegistryValue Root="HKCR" Key="Python.CompiledFile\shellex\DropHandler" Value="{BEA218D2-6950-497B-9434-61683EC065FE}" Type="string" /> - <ProgId Id="Python.ArchiveFile" Description="!(loc.PythonArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1"> + <ProgId Id="Python.Extension" Description="!(loc.PythonExtensionDescription)" Advertise="no" Icon="py.exe" IconIndex="3"> + <Extension Id="pyd" /> + </ProgId> + + <ProgId Id="Python.ArchiveFile" Description="!(loc.PythonArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="5"> <Extension Id="pyz" ContentType="application/x-zip-compressed"> <Verb Id="open" TargetFile="py.exe" Argument=""%L" %*" /> </Extension> </ProgId> <RegistryValue Root="HKCR" Key="Python.ArchiveFile\shellex\DropHandler" Value="{BEA218D2-6950-497B-9434-61683EC065FE}" Type="string" /> - <ProgId Id="Python.NoConArchiveFile" Description="!(loc.PythonNoConArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1"> + <ProgId Id="Python.NoConArchiveFile" Description="!(loc.PythonNoConArchiveFileDescription)" Advertise="no" Icon="py.exe" IconIndex="5"> <Extension Id="pyzw" ContentType="application/x-zip-compressed"> <Verb Id="open" TargetFile="pyw.exe" Argument=""%L" %*" /> </Extension> |