Skip to content

Commit 9bcd2d1

Browse files
author
Anselm Kruis
committed
Issue python#112: adapt the new msi installer to Stackless Python
- Change the product and file names to Stackless (Python). - Add Stackless include files - Update the Product and Download URLs (cherry picked from commit 0c1f53c)
1 parent f78d77c commit 9bcd2d1

File tree

11 files changed

+78
-20
lines changed

11 files changed

+78
-20
lines changed

‎Tools/msi/buildrelease.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rem
1212
rem The following substitutions will be applied to the release URI:
1313
rem Variable Description Example
1414
rem {arch} architecture amd64, win32
15-
set RELEASE_URI=http://www.python.org/{arch}
15+
set RELEASE_URI=http://www.stackless.com/{arch}
1616

1717
rem This is the URL that will be used to download installation files.
1818
rem The files available from the default URL *will* conflict with your
@@ -25,7 +25,7 @@ rem {version} version number 3.5.0
2525
rem {arch} architecture amd64, win32
2626
rem {releasename} release name a1, b2, rc3 (or blank for final)
2727
rem {msi} MSI filename core.msi
28-
set DOWNLOAD_URL=https://www.python.org/ftp/python/{version}/{arch}{releasename}/{msi}
28+
set DOWNLOAD_URL=http://www.stackless.com/binaries/MSI/{version}/{arch}{releasename}/{msi}
2929

3030
set D=%~dp0
3131
set PCBUILD=%D%..\..\PCBuild\

‎Tools/msi/bundle/bundle.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<?endif ?>
3636
<Variable Name="TargetDir" Value="" bal:Overridable="yes" />
3737
<?if $(var.Platform)~="x64" ?>
38-
<Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]Python[WinVerNoDot]" bal:Overridable="yes" />
38+
<Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]Stackless[WinVerNoDot]" bal:Overridable="yes" />
3939
<Variable Name="TargetPlatform" Value="x64" />
4040
<?else ?>
41-
<Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]Python[WinVerNoDot]" bal:Overridable="yes" />
41+
<Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]Stackless[WinVerNoDot]" bal:Overridable="yes" />
4242
<Variable Name="TargetPlatform" Value="x86" />
4343
<?endif ?>
44-
<Variable Name="DefaultJustForMeTargetDir" Value="[LocalAppDataFolder]Programs\Python\Python[WinVerNoDot]" bal:Overridable="yes" />
44+
<Variable Name="DefaultJustForMeTargetDir" Value="[LocalAppDataFolder]Programs\Python\Stackless[WinVerNoDot]" bal:Overridable="yes" />
4545
<Variable Name="OptionalFeaturesRegistryKey" Value="Software\Python\PythonCore\[WinVer]\InstalledFeatures" />
4646
<Variable Name="TargetDirRegistryKey" Value="Software\Python\PythonCore\[WinVer]\InstallPath" />
4747

‎Tools/msi/bundle/full.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{3E204ADD-238D-4D10-852C-4F859325C839}</ProjectGuid>
5-
<OutputName>python</OutputName>
5+
<OutputName>stackless</OutputName>
66
<OutputSuffix>full</OutputSuffix>
77
</PropertyGroup>
88

‎Tools/msi/bundle/releaselocal.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{FCD43AC9-969F-49A1-8AC5-EDC27599D1EB}</ProjectGuid>
5-
<OutputName>python</OutputName>
5+
<OutputName>stackless</OutputName>
66
<OutputSuffix></OutputSuffix>
77
</PropertyGroup>
88

‎Tools/msi/bundle/releaseweb.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{71CDE213-CB39-4BD9-B89D-BBB878689144}</ProjectGuid>
5-
<OutputName>python</OutputName>
5+
<OutputName>stackless</OutputName>
66
<OutputSuffix>webinstall</OutputSuffix>
77
</PropertyGroup>
88

‎Tools/msi/bundle/snapshot.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{8A4A1162-4BF9-4FF6-9A98-315F01E44932}</ProjectGuid>
5-
<OutputName>python</OutputName>
5+
<OutputName>stackless</OutputName>
66
<OutputSuffix></OutputSuffix>
77
</PropertyGroup>
88

‎Tools/msi/common_en-US.wxl_template

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
33
<String Id="LCID">1033</String>
44
<String Id="Culture">en-us</String>
5-
<String Id="ProductName">Python {{ShortVersion}}</String>
6-
<String Id="FullProductName">Python {{LongVersion}} ({{Bitness}})</String>
7-
<String Id="Title">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}})</String>
8-
<String Id="Description">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}})</String>
9-
<String Id="TitlePdb">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} symbols)</String>
10-
<String Id="DescriptionPdb">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} symbols)</String>
11-
<String Id="Title_d">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} debug)</String>
12-
<String Id="Description_d">Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} debug)</String>
13-
<String Id="Manufacturer">Python Software Foundation</String>
5+
<String Id="ProductName">Stackless Python {{ShortVersion}}</String>
6+
<String Id="FullProductName">Stackless Python {{LongVersion}} ({{Bitness}})</String>
7+
<String Id="Title">Stackless Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}})</String>
8+
<String Id="Description">Stackless Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}})</String>
9+
<String Id="TitlePdb">Stackless Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} symbols)</String>
10+
<String Id="DescriptionPdb">Stackless Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} symbols)</String>
11+
<String Id="Title_d">Stackless Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} debug)</String>
12+
<String Id="Description_d">Stackless Python {{LongVersion}} !(loc.Descriptor) ({{Bitness}} debug)</String>
13+
<String Id="Manufacturer">The Stackless Team</String>
1414
<String Id="NoDowngrade">A newer version of !(loc.ProductName) is already installed.</String>
1515
<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>
1616
<String Id="NoTargetDir">The TARGETDIR variable must be provided when invoking this installer.</String>

‎Tools/msi/dev/dev.wxs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PropertyRef Id="UpgradeTable" />
88

99
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
10+
<ComponentGroupRef Id="dev_include_Stackless" />
1011
<ComponentGroupRef Id="dev_include" />
1112
<ComponentGroupRef Id="dev_pyconfig" />
1213
<ComponentGroupRef Id="dev_libs" />

‎Tools/msi/dev/dev_files.wxs

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,56 @@
3939
</ComponentGroup>
4040
</Fragment>
4141
<?endif ?>
42+
43+
<Fragment>
44+
<DirectoryRef Id="include">
45+
<Directory Id="include_Stackless" Name="Stackless" />
46+
</DirectoryRef>
47+
</Fragment>
48+
<Fragment>
49+
<DirectoryRef Id="include_Stackless">
50+
<Directory Id="include_Stackless_core" Name="core" />
51+
<Directory Id="include_Stackless_module" Name="module" />
52+
<Directory Id="include_Stackless_pickling" Name="pickling" />
53+
<Directory Id="include_Stackless_platf" Name="platf" />
54+
</DirectoryRef>
55+
</Fragment>
56+
<Fragment>
57+
<ComponentGroup Id="dev_include_Stackless">
58+
<!-- Stackless\*.h -->
59+
<?foreach header in stackless.h;stackless_api.h;stackless_version.h?>
60+
<Component Id="include_Stackless_$(var.header)" Directory="include_Stackless" Guid="*">
61+
<File Id="include_Stackless_$(var.header)" Name="$(var.header)" Source="!(bindpath.src)Stackless\$(var.header)" />
62+
</Component>
63+
<?endforeach ?>
64+
65+
<!-- Stackless\core\*.h -->
66+
<?foreach header in backwardcompat.h;cframeobject.h;slp_exttype.h;stackless_impl.h;stackless_methods.h;stackless_structs.h;stackless_tstate.h?>
67+
<Component Id="include_Stackless_core_$(var.header)" Directory="include_Stackless_core" Guid="*">
68+
<File Id="include_Stackless_core_$(var.header)" Name="$(var.header)" Source="!(bindpath.src)Stackless\core\$(var.header)" />
69+
</Component>
70+
<?endforeach ?>
71+
72+
<!-- Stackless\module\*.h -->
73+
<?foreach header in channelobject.h?>
74+
<Component Id="include_Stackless_module_$(var.header)" Directory="include_Stackless_module" Guid="*">
75+
<File Id="include_Stackless_module_$(var.header)" Name="$(var.header)" Source="!(bindpath.src)Stackless\module\$(var.header)" />
76+
</Component>
77+
<?endforeach ?>
78+
79+
<!-- Stackless\pickling\*.h -->
80+
<?foreach header in prickelpit.h?>
81+
<Component Id="include_Stackless_pickling_$(var.header)" Directory="include_Stackless_pickling" Guid="*">
82+
<File Id="include_Stackless_pickling_$(var.header)" Name="$(var.header)" Source="!(bindpath.src)Stackless\pickling\$(var.header)" />
83+
</Component>
84+
<?endforeach ?>
85+
86+
<!-- Stackless\platf\*.h -->
87+
<?foreach header in slp_platformselect.h;switch_arm32_gcc.h;switch_ppc_unix.h;switch_sparc_sun_gcc.h;switch_x86_unix.h;switch_amd64_unix.h;switch_mips_unix.h;switch_ps3_SNTools.h;switch_x64_msvc.h;switch_arm_thumb_gcc.h;switch_ppc_macosx.h;switch_s390_unix.h;switch_x86_msvc.h?>
88+
<Component Id="include_Stackless_platf_$(var.header)" Directory="include_Stackless_platf" Guid="*">
89+
<File Id="include_Stackless_platf_$(var.header)" Name="$(var.header)" Source="!(bindpath.src)Stackless\platf\$(var.header)" />
90+
</Component>
91+
<?endforeach ?>
92+
</ComponentGroup>
93+
</Fragment>
4294
</Wix>

‎Tools/msi/make_zip.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ProjectGuid>{10487945-15D1-4092-A214-338395C4116B}</ProjectGuid>
5-
<OutputName>python</OutputName>
5+
<OutputName>stackless</OutputName>
66
<OutputSuffix></OutputSuffix>
77
<SupportSigning>false</SupportSigning>
88
</PropertyGroup>
@@ -11,7 +11,7 @@
1111

1212
<PropertyGroup>
1313
<SignOutput>false</SignOutput>
14-
<TargetName>python-$(PythonVersion)-embed-$(ArchName)</TargetName>
14+
<TargetName>$(OutputName)-$(PythonVersion)-embed-$(ArchName)</TargetName>
1515
<TargetExt>.zip</TargetExt>
1616
<TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath>
1717
<CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>

0 commit comments

Comments
 (0)