Author: [email protected]
Branch: windowsinstaller
Changeset: r95811:0a8a958e20ed
Date: 2018-12-29 20:40 +0000
http://bitbucket.org/pypy/pypy/changeset/0a8a958e20ed/
Log: lib-python builds
diff --git a/pypy/tool/release/windowsinstaller/bundle/bundle.targets
b/pypy/tool/release/windowsinstaller/bundle/bundle.targets
--- a/pypy/tool/release/windowsinstaller/bundle/bundle.targets
+++ b/pypy/tool/release/windowsinstaller/bundle/bundle.targets
@@ -64,8 +64,8 @@
<Package Include="..\include\include*.wixproj" />
<Package Include="..\lib_pypy\lib_pypy*.wixproj" />
<Package Include="..\exe\exe*.wixproj" />
- <Package Include="..\libs\libs*.wixproj" />
<Package Include="..\lib_python\lib_python*.wixproj" />
+ <Package Include="..\libs\libs*.wixproj" />
<Package Include="..\sitepackages\sitepackages*.wixproj" />
<Package Include="..\tcl\tcl*.wixproj" />
</ItemGroup>
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
@@ -97,6 +97,8 @@
<Chain ParallelCache="yes">
<PackageGroupRef Id="include" />
<PackageGroupRef Id="lib_pypy" />
- </Chain>
+ <PackageGroupRef Id="exe" />
+ <PackageGroupRef Id="lib_python" />
+ </Chain>
</Bundle>
</Wix>
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
@@ -80,6 +80,11 @@
<Directory Id="include" Name="include" />
</DirectoryRef>
</Fragment>
+ <Fragment>
+ <DirectoryRef Id="InstallDirectory">
+ <Directory Id="lib_python" Name="lib-python" />
+ </DirectoryRef>
+ </Fragment>
<Fragment>
<DirectoryRef Id="InstallDirectory">
diff --git a/pypy/tool/release/windowsinstaller/lib_python/lib_python.wixproj
b/pypy/tool/release/windowsinstaller/lib_python/lib_python.wixproj
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/lib_python/lib_python.wixproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <ProjectGuid>{221C8034-F90F-42E4-951F-7752B54F029D}</ProjectGuid>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputName Condition="'$(OutputName)' == ''">lib_python</OutputName>
+ <OutputType>Package</OutputType>
+ </PropertyGroup>
+ <Import Project="..\msi.props" />
+ <ItemGroup>
+ <Compile Include="lib_python.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="*.wxl" />
+ </ItemGroup>
+ <ItemGroup>
+ <InstallFiles Include="$(PySourcePath)lib-python\**\*"
+ Exclude="$(PySourcePath)lib-python\**\*.pyc;
+ $(PySourcePath)lib-python\**\*.pyo;
+
$(PySourcePath)lib-python\3\site-packages\README;
+
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
+
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
+ <SourceBase>$(PySourcePath)</SourceBase>
+ <Source>!(bindpath.src)</Source>
+ <TargetBase>$(PySourcePath)</TargetBase>
+ <Target_></Target_>
+ <Group>lib_python</Group>
+ </InstallFiles>
+ </ItemGroup>
+ <Import Project="..\msi.targets" />
+</Project>
\ No newline at end of file
diff --git a/pypy/tool/release/windowsinstaller/lib_python/lib_python.wxs
b/pypy/tool/release/windowsinstaller/lib_python/lib_python.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/lib_python/lib_python.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)"
Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)"
UpgradeCode="$(var.UpgradeCode)">
+ <Package InstallerVersion="300" Compressed="yes"
InstallScope="perUser" Platform="$(var.Platform)" />
+ <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
+
+ <PropertyRef Id="UpgradeTable" />
+
+ <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)"
Description="!(loc.Description)">
+ <ComponentGroupRef Id="lib_python" />
+ <ComponentRef Id="OptionalFeature" />
+ </Feature>
+ </Product>
+</Wix>
diff --git a/pypy/tool/release/windowsinstaller/lib_python/lib_python_en-US.wxl
b/pypy/tool/release/windowsinstaller/lib_python/lib_python_en-US.wxl
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/lib_python/lib_python_en-US.wxl
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us"
xmlns="http://schemas.microsoft.com/wix/2006/localization";>
+ <String Id="Descriptor">Python Library</String>
+ <String Id="ShortDescriptor">lib python</String>
+</WixLocalization>
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
