Author: [email protected]
Branch: windowsinstaller
Changeset: r95813:e0469a100160
Date: 2018-12-30 22:08 +0000
http://bitbucket.org/pypy/pypy/changeset/e0469a100160/
Log: Added external and site packages.
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
@@ -63,11 +63,11 @@
<ItemGroup>
<Package Include="..\include\include*.wixproj" />
<Package Include="..\lib_pypy\lib_pypy*.wixproj" />
+ <Package Include="..\external\external*.wixproj" />
<Package Include="..\exe\exe*.wixproj" />
<Package Include="..\lib_python\lib_python*.wixproj" />
<Package Include="..\libs\libs*.wixproj" />
- <Package Include="..\sitepackages\sitepackages*.wixproj" />
- <Package Include="..\tcl\tcl*.wixproj" />
+ <Package Include="..\site-packages\site-packages*.wixproj" />
</ItemGroup>
<PropertyGroup>
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
@@ -100,6 +100,8 @@
<PackageGroupRef Id="exe" />
<PackageGroupRef Id="lib_python" />
<PackageGroupRef Id="libs" />
- </Chain>
+ <PackageGroupRef Id="external" />
+ <PackageGroupRef Id="site-packages" />
+ </Chain>
</Bundle>
</Wix>
diff --git
a/pypy/tool/release/windowsinstaller/bundle/packagegroups/external.wxs
b/pypy/tool/release/windowsinstaller/bundle/packagegroups/external.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/external.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Fragment>
+ <PackageGroup Id="external">
+ <MsiPackage Id="external_AllUsers"
+ SourceFile="external.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="yes"
+ InstallCondition="InstallAllUsers and Include_external
and not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ <MsiPackage Id="external_JustForMe"
+ SourceFile="external.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="no"
+ InstallCondition="not InstallAllUsers and
Include_external and not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ </PackageGroup>
+ </Fragment>
+</Wix>
\ No newline at end of file
diff --git
a/pypy/tool/release/windowsinstaller/bundle/packagegroups/site-packages.wxs
b/pypy/tool/release/windowsinstaller/bundle/packagegroups/site-packages.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/site-packages.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Fragment>
+ <PackageGroup Id="site-packages">
+ <MsiPackage Id="site-packages_AllUsers"
+ SourceFile="site-packages.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="yes"
+ InstallCondition="InstallAllUsers and
Include_site-packages and not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ <MsiPackage Id="site-packages_JustForMe"
+ SourceFile="site-packages.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="no"
+ InstallCondition="not InstallAllUsers and
Include_site-packages and not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ </PackageGroup>
+ </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/pypy/tool/release/windowsinstaller/external/external.wixproj
b/pypy/tool/release/windowsinstaller/external/external.wixproj
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/external/external.wixproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <ProjectGuid>{97B17A60-4BE4-40CE-B187-E9A9A47319BB}</ProjectGuid>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputName Condition="'$(OutputName)' == ''">external</OutputName>
+ <OutputType>Package</OutputType>
+ </PropertyGroup>
+ <Import Project="..\msi.props" />
+ <ItemGroup>
+ <Compile Include="external.wxs" />
+ <Compile Include="external_files.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="*.wxl" />
+ <WxlTemplate Include="*.wxl_template" />
+ </ItemGroup>
+ <ItemGroup>
+ <InstallFiles Include="$(PySourcePath)externals\lib\tcl8.5\**\*">
+ <SourceBase>$(PySourcePath)</SourceBase>
+ <Source>!(bindpath.src)</Source>
+ <TargetBase>$(PySourcePath)</TargetBase>
+ <Target_></Target_>
+ <Group>tcl</Group>
+ </InstallFiles>
+ <InstallFiles Include="$(PySourcePath)externals\lib\tk8.5\**\*">
+ <SourceBase>$(PySourcePath)</SourceBase>
+ <Source>!(bindpath.src)</Source>
+ <TargetBase>$(PySourcePath)</TargetBase>
+ <Target_></Target_>
+ <Group>tcl</Group>
+ </InstallFiles>
+ </ItemGroup>
+ <Import Project="..\msi.targets" />
+</Project>
\ No newline at end of file
diff --git a/pypy/tool/release/windowsinstaller/external/external.wxs
b/pypy/tool/release/windowsinstaller/external/external.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/external/external.wxs
@@ -0,0 +1,12 @@
+<?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="external" Primary="yes" />
+ <ComponentRef Id="OptionalFeature" />
+ </Feature>
+ </Product>
+</Wix>
diff --git
a/pypy/tool/release/windowsinstaller/external/external_en-US.wxl_template
b/pypy/tool/release/windowsinstaller/external/external_en-US.wxl_template
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/external/external_en-US.wxl_template
@@ -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">External Libraries</String>
+ <String Id="ShortDescriptor">external</String>
+</WixLocalization>
diff --git a/pypy/tool/release/windowsinstaller/external/external_files.wxs
b/pypy/tool/release/windowsinstaller/external/external_files.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/external/external_files.wxs
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Fragment>
+ <ComponentGroup Id="external">
+ <Component Id="sqlite3" Directory="InstallDirectory" Guid="*">
+ <File Name="sqlite3"
Source="!(bindpath.src)externals\lib\sqlite3.lib" KeyPath="yes" />
+ </Component>
+ <Component Id="tcl85" Directory="InstallDirectory" Guid="*">
+ <File Name="tcl85"
Source="!(bindpath.src)externals\bin\tcl85.dll" KeyPath="yes" />
+ </Component>
+ <Component Id="tk85" Directory="InstallDirectory" Guid="*">
+ <File Name="tk85"
Source="!(bindpath.src)externals\bin\tk85.dll" KeyPath="yes" />
+ </Component>
+ </ComponentGroup>
+ </Fragment>
+</Wix>
diff --git
a/pypy/tool/release/windowsinstaller/site-packages/site-packages.wixproj
b/pypy/tool/release/windowsinstaller/site-packages/site-packages.wixproj
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/site-packages/site-packages.wixproj
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <ProjectGuid>{CB35E339-9711-49F0-A231-5FB2B1211BDB}</ProjectGuid>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputName Condition="'$(OutputName)' ==
''">site-packages</OutputName>
+ <OutputType>Package</OutputType>
+ </PropertyGroup>
+ <Import Project="..\msi.props" />
+ <ItemGroup>
+ <Compile Include="site-packages.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="*.wxl" />
+ </ItemGroup>
+ <ItemGroup>
+ <InstallFiles Include="$(PySourcePath)site-packages\*">
+ <SourceBase>$(PySourcePath)</SourceBase>
+ <Source>!(bindpath.src)</Source>
+ <TargetBase>$(PySourcePath)</TargetBase>
+ <Target_></Target_>
+ <Group>site-packages</Group>
+ </InstallFiles>
+ </ItemGroup>
+ <Import Project="..\msi.targets" />
+</Project>
\ No newline at end of file
diff --git a/pypy/tool/release/windowsinstaller/site-packages/site-packages.wxs
b/pypy/tool/release/windowsinstaller/site-packages/site-packages.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/site-packages/site-packages.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="site-packages" />
+ <ComponentRef Id="OptionalFeature" />
+ </Feature>
+ </Product>
+</Wix>
diff --git
a/pypy/tool/release/windowsinstaller/site-packages/site-packages_en-US.wxl
b/pypy/tool/release/windowsinstaller/site-packages/site-packages_en-US.wxl
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/site-packages/site-packages_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">Site Packages</String>
+ <String Id="ShortDescriptor">site packages</String>
+</WixLocalization>
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
