diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-07-25 01:04:29 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-07-25 01:04:29 (GMT) |
| commit | 05338267ab75c0a0948049280da0224ecc2fb7dc (patch) | |
| tree | d9c09b0986a40126fba69293675c361e994bb7e4 /Tools/msi/exe | |
| parent | 95f7b9fcaca03d442aa2f26fd79f093cbcbc7003 (diff) | |
| download | cpython-05338267ab75c0a0948049280da0224ecc2fb7dc.zip cpython-05338267ab75c0a0948049280da0224ecc2fb7dc.tar.gz cpython-05338267ab75c0a0948049280da0224ecc2fb7dc.tar.bz2 | |
Issue #27610: Adds PEP 514 metadata to Windows installer
Diffstat (limited to 'Tools/msi/exe')
| -rw-r--r-- | Tools/msi/exe/exe.wixproj | 1 | ||||
| -rw-r--r-- | Tools/msi/exe/exe.wxs | 2 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_d.wixproj | 1 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_en-US.wxl_template | 1 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_files.wxs | 3 | ||||
| -rw-r--r-- | Tools/msi/exe/exe_pdb.wixproj | 1 |
6 files changed, 8 insertions, 1 deletions
diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index d26a603..24df0f5 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -14,6 +14,7 @@ <ItemGroup> <Compile Include="exe.wxs" /> <Compile Include="exe_files.wxs" /> + <Compile Include="exe_reg.wxs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="*.wxl" /> diff --git a/Tools/msi/exe/exe.wxs b/Tools/msi/exe/exe.wxs index 154cee5..03d43c6 100644 --- a/Tools/msi/exe/exe.wxs +++ b/Tools/msi/exe/exe.wxs @@ -9,6 +9,7 @@ <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)"> <ComponentGroupRef Id="exe_python" Primary="yes" /> + <ComponentGroupRef Id="exe_reg" Primary="yes" /> <ComponentGroupRef Id="exe_txt" /> <ComponentGroupRef Id="exe_icons" /> <ComponentRef Id="OptionalFeature" /> @@ -24,7 +25,6 @@ WorkingDirectory="InstallDirectory" /> <RemoveFolder Id="Remove_MenuDir" Directory="MenuDir" On="uninstall" /> <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> - <RegistryValue Key="InstallPath\InstallGroup" Type="string" Value="!(loc.ProductName)" KeyPath="yes" /> <RegistryValue Key="InstalledFeatures" Name="Shortcuts" Type="string" Value="$(var.Version)" /> </RegistryKey> </Component> diff --git a/Tools/msi/exe/exe_d.wixproj b/Tools/msi/exe/exe_d.wixproj index 27545ca..cf085be 100644 --- a/Tools/msi/exe/exe_d.wixproj +++ b/Tools/msi/exe/exe_d.wixproj @@ -10,6 +10,7 @@ <ItemGroup> <Compile Include="exe_d.wxs" /> <Compile Include="exe_files.wxs" /> + <Compile Include="exe_reg.wxs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="*.wxl" /> diff --git a/Tools/msi/exe/exe_en-US.wxl_template b/Tools/msi/exe/exe_en-US.wxl_template index 577fbe5..1f9e290 100644 --- a/Tools/msi/exe/exe_en-US.wxl_template +++ b/Tools/msi/exe/exe_en-US.wxl_template @@ -4,4 +4,5 @@ <String Id="ShortDescriptor">executable</String> <String Id="ShortcutName">Python {{ShortVersion}} ({{Bitness}})</String> <String Id="ShortcutDescription">Launches the !(loc.ProductName) interpreter.</String> + <String Id="SupportUrl">http://www.python.org/</String> </WixLocalization> diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index 9e47b5d..c157f40 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -28,6 +28,9 @@ </Component> <Component Id="pythonw.exe" Directory="InstallDirectory" Guid="$(var.PythonwExeComponentGuid)"> <File Name="pythonw.exe" KeyPath="yes" /> + <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> + <RegistryValue Key="InstallPath" Name="WindowedExecutablePath" Type="string" Value="[#pythonw.exe]" KeyPath="no" /> + </RegistryKey> </Component> <Component Id="vcruntime140.dll" Directory="InstallDirectory" Guid="*"> <File Name="vcruntime140.dll" Source="!(bindpath.redist)vcruntime140.dll" KeyPath="yes" /> diff --git a/Tools/msi/exe/exe_pdb.wixproj b/Tools/msi/exe/exe_pdb.wixproj index 4f4c869..bf1213e 100644 --- a/Tools/msi/exe/exe_pdb.wixproj +++ b/Tools/msi/exe/exe_pdb.wixproj @@ -10,6 +10,7 @@ <ItemGroup> <Compile Include="exe_pdb.wxs" /> <Compile Include="exe_files.wxs" /> + <Compile Include="exe_reg.wxs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="*.wxl" /> |