Author: andrew.lawre...@siemens.com
Branch: windowsinstaller
Changeset: r95808:8acc3489da28
Date: 2018-12-26 17:47 +0000
http://bitbucket.org/pypy/pypy/changeset/8acc3489da28/
Log: Corrected a large number of cpython references.
diff --git a/pypy/tool/release/windowsinstaller/bundle/SideBar.png
b/pypy/tool/release/windowsinstaller/bundle/SideBar.png
new file mode 100644
index
e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..037da0d8515b469ff9e6ef1ad0e9b393b6f1f154
GIT binary patch
[cut]
diff --git a/pypy/tool/release/windowsinstaller/bundle/SideBar.xcf
b/pypy/tool/release/windowsinstaller/bundle/SideBar.xcf
new file mode 100644
index
e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..19f731cb5a7d8be36ef5f14d5dfd677058ffeb75
GIT binary patch
[cut]
diff --git a/pypy/tool/release/windowsinstaller/bundle/bundle.wxs
b/pypy/tool/release/windowsinstaller/bundle/bundle.wxs
--- a/pypy/tool/release/windowsinstaller/bundle/bundle.wxs
+++ b/pypy/tool/release/windowsinstaller/bundle/bundle.wxs
@@ -34,15 +34,15 @@
<?endif ?>
<Variable Name="TargetDir" Value="" bal:Overridable="yes" />
<?if $(var.Platform)~="x64" ?>
- <Variable Name="DefaultAllUsersTargetDir"
Value="[ProgramFiles64Folder]Python[WinVerNoDot]" bal:Overridable="yes" />
+ <Variable Name="DefaultAllUsersTargetDir"
Value="[ProgramFiles64Folder]PyPy[WinVerNoDot]" bal:Overridable="yes" />
<Variable Name="TargetPlatform" Value="x64" />
<?else ?>
- <Variable Name="DefaultAllUsersTargetDir"
Value="[ProgramFilesFolder]Python[WinVerNoDot]" bal:Overridable="yes" />
+ <Variable Name="DefaultAllUsersTargetDir"
Value="[ProgramFilesFolder]PyPy[WinVerNoDot]" bal:Overridable="yes" />
<Variable Name="TargetPlatform" Value="x86" />
<?endif ?>
- <Variable Name="DefaultJustForMeTargetDir"
Value="[LocalAppDataFolder]Programs\Python\Python[WinVerNoDot]"
bal:Overridable="yes" />
- <Variable Name="OptionalFeaturesRegistryKey"
Value="Software\Python\PythonCore\[WinVer]\InstalledFeatures" />
- <Variable Name="TargetDirRegistryKey"
Value="Software\Python\PythonCore\[WinVer]\InstallPath" />
+ <Variable Name="DefaultJustForMeTargetDir"
Value="[LocalAppDataFolder]Programs\PyPy\PyPy[WinVerNoDot]"
bal:Overridable="yes" />
+ <Variable Name="OptionalFeaturesRegistryKey"
Value="Software\Python\PyPy\[WinVer]\InstalledFeatures" />
+ <Variable Name="TargetDirRegistryKey"
Value="Software\Python\PyPy\[WinVer]\InstallPath" />
<!--
An empty string will use the other defaults based on InstallAllUsers
diff --git a/pypy/tool/release/windowsinstaller/common.wxs
b/pypy/tool/release/windowsinstaller/common.wxs
--- a/pypy/tool/release/windowsinstaller/common.wxs
+++ b/pypy/tool/release/windowsinstaller/common.wxs
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
- <Property Id="ROOTREGISTRYKEY" Value="Software\Python\PythonCore" />
+ <Property Id="ROOTREGISTRYKEY" Value="Software\Python\PyPy" />
</Fragment>
<Fragment>
- <Property Id="REGISTRYKEY"
Value="Software\Python\PythonCore\$(var.ShortVersion)$(var.PyArchExt)$(var.PyTestExt)"
/>
+ <Property Id="REGISTRYKEY"
Value="Software\Python\PyPy\$(var.ShortVersion)$(var.PyArchExt)$(var.PyTestExt)"
/>
</Fragment>
<Fragment>
diff --git a/pypy/tool/release/windowsinstaller/common_en-US.wxl_template
b/pypy/tool/release/windowsinstaller/common_en-US.wxl_template
--- a/pypy/tool/release/windowsinstaller/common_en-US.wxl_template
+++ b/pypy/tool/release/windowsinstaller/common_en-US.wxl_template
@@ -2,17 +2,17 @@
<WixLocalization Culture="en-us"
xmlns="http://schemas.microsoft.com/wix/2006/localization";>
<String Id="LCID">1033</String>
<String Id="Culture">en-us</String>
- <String Id="ProductName">Python {{ShortVersion}}</String>
- <String Id="FullProductName">Python {{LongVersion}} ({{Bitness}})</String>
- <String Id="Title">Python {{LongVersion}} !(loc.Descriptor)
({{Bitness}})</String>
- <String Id="Description">Python {{LongVersion}} !(loc.Descriptor)
({{Bitness}})</String>
- <String Id="TitlePdb">Python {{LongVersion}} !(loc.Descriptor)
({{Bitness}} symbols)</String>
- <String Id="DescriptionPdb">Python {{LongVersion}} !(loc.Descriptor)
({{Bitness}} symbols)</String>
- <String Id="Title_d">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}}
debug)</String>
- <String Id="Description_d">Python {{LongVersion}} !(loc.Descriptor)
({{Bitness}} debug)</String>
- <String Id="Manufacturer">Python Software Foundation</String>
+ <String Id="ProductName">PyPy {{ShortVersion}}</String>
+ <String Id="FullProductName">PyPy {{LongVersion}} ({{Bitness}})</String>
+ <String Id="Title">PyPy {{LongVersion}} !(loc.Descriptor)
({{Bitness}})</String>
+ <String Id="Description">PyPy {{LongVersion}} !(loc.Descriptor)
({{Bitness}})</String>
+ <String Id="TitlePdb">PyPy {{LongVersion}} !(loc.Descriptor) ({{Bitness}}
symbols)</String>
+ <String Id="DescriptionPdb">PyPy {{LongVersion}} !(loc.Descriptor)
({{Bitness}} symbols)</String>
+ <String Id="Title_d">PyPy {{LongVersion}} !(loc.Descriptor) ({{Bitness}}
debug)</String>
+ <String Id="Description_d">PyPy {{LongVersion}} !(loc.Descriptor)
({{Bitness}} debug)</String>
+ <String Id="Manufacturer">PyPy Development Team</String>
<String Id="NoDowngrade">A newer version of !(loc.ProductName) is already
installed.</String>
<String Id="IncorrectCore">An incorrect version of a prerequisite package
is installed. Please uninstall any other versions of !(loc.ProductName) and try
installing this again.</String>
<String Id="NoTargetDir">The TARGETDIR variable must be provided when
invoking this installer.</String>
- <String Id="ManufacturerSupportUrl">http://www.python.org/</String>
+ <String Id="ManufacturerSupportUrl">http://pypy.org/</String>
</WixLocalization>
diff --git a/pypy/tool/release/windowsinstaller/msi.props
b/pypy/tool/release/windowsinstaller/msi.props
--- a/pypy/tool/release/windowsinstaller/msi.props
+++ b/pypy/tool/release/windowsinstaller/msi.props
@@ -28,7 +28,7 @@
that intend to bundle Python should rebuild these modules with their
own URI to avoid conflicting with the official releases.
- The official releases use "http://www.python.org/$(ArchName)"
+ The official releases use "http://pypy.org/$(ArchName)"
This is not the same as the DownloadUrl property used in the bundle
projects.
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
