Author: [email protected]
Branch: windowsinstaller
Changeset: r95810:8d97265b8c16
Date: 2018-12-27 18:09 +0000
http://bitbucket.org/pypy/pypy/changeset/8d97265b8c16/
Log: Fixed missing file ids.
diff --git a/pypy/tool/release/windowsinstaller/exe/exe.wxs
b/pypy/tool/release/windowsinstaller/exe/exe.wxs
--- a/pypy/tool/release/windowsinstaller/exe/exe.wxs
+++ b/pypy/tool/release/windowsinstaller/exe/exe.wxs
@@ -17,10 +17,10 @@
</Feature>
<Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)"
Description="!(loc.Description)">
- <ComponentGroupRef Id="exe_pypy" />
+ <ComponentGroupRef Id="exe_pypy" />
<Component Id="exe_shortcut" Directory="MenuDir" Guid="*">
- <Shortcut Id="exe_pypyc"
- Target="[#pypy3-c.exe]"
+ <Shortcut Id="pypy3_c_shortcut"
+ Target="[#pypy3_c]"
Name="!(loc.ShortcutName)"
Description="!(loc.ShortcutDescription)"
WorkingDirectory="InstallDirectory" />
diff --git a/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
b/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
--- a/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
+++ b/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
@@ -15,16 +15,16 @@
<PropertyRef Id="REGISTRYKEY" />
<ComponentGroup Id="exe_pypy">
<Component Id="exe_pypyc" Directory="InstallDirectory"
Guid="$(var.PythonExeComponentGuid)">
- <File Name="pypy3-c" Source="!(bindpath.goal)pypy3-c.exe"
KeyPath="yes" />
+ <File Id="pypy3_c" Name="pypy3-c.exe"
Source="!(bindpath.goal)pypy3-c.exe" KeyPath="yes" />
<RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
<RegistryValue Key="InstallPath" Type="string"
Value="[InstallDirectory]" KeyPath="no" />
- <RegistryValue Key="InstallPath" Name="ExecutablePath"
Type="string" Value="[#pypy3-c.exe]" KeyPath="no" />
+ <RegistryValue Key="InstallPath" Name="ExecutablePath"
Type="string" Value="[#pypy3_c]" KeyPath="no" />
</RegistryKey>
</Component>
<Component Id="exe_pypycw" Directory="InstallDirectory"
Guid="$(var.PythonwExeComponentGuid)">
- <File Name="pypy3-cw" Source="!(bindpath.goal)pypy3-cw.exe"
KeyPath="yes" />
+ <File Id="pypy3_cw" Name="pypy3-cw"
Source="!(bindpath.goal)pypy3-cw.exe" KeyPath="yes" />
<RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
- <RegistryValue Key="InstallPath"
Name="WindowedExecutablePath" Type="string" Value="[#pypy3-cw.exe]"
KeyPath="no" />
+ <RegistryValue Key="InstallPath"
Name="WindowedExecutablePath" Type="string" Value="[#pypy3_cw]" KeyPath="no" />
</RegistryKey>
</Component>
<Component Id="libpypy3" Directory="InstallDirectory" Guid="*">
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
