Author: andrew.lawre...@siemens.com Branch: windowsinstaller Changeset: r95812:8c7fe370d197 Date: 2018-12-29 21:34 +0000 http://bitbucket.org/pypy/pypy/changeset/8c7fe370d197/
Log: Added libs folder 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 @@ -66,7 +66,7 @@ <Variable Name="Include_include" Value="1" /> <Variable Name="Include_exe" Value="1" bal:Overridable="yes" /> <Variable Name="Include_dev" Value="1" bal:Overridable="yes" /> - <Variable Name="Include_lib" Value="1" bal:Overridable="yes" /> + <Variable Name="Include_libs" Value="1" bal:Overridable="yes" /> <Variable Name="Include_test" Value="1" bal:Overridable="yes" /> <Variable Name="Include_doc" Value="1" bal:Overridable="yes" /> <Variable Name="Include_tools" Value="1" bal:Overridable="yes" /> @@ -99,6 +99,7 @@ <PackageGroupRef Id="lib_pypy" /> <PackageGroupRef Id="exe" /> <PackageGroupRef Id="lib_python" /> + <PackageGroupRef Id="libs" /> </Chain> </Bundle> </Wix> diff --git a/pypy/tool/release/windowsinstaller/bundle/packagegroups/lib_python.wxs b/pypy/tool/release/windowsinstaller/bundle/packagegroups/lib_python.wxs new file mode 100644 --- /dev/null +++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/lib_python.wxs @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <PackageGroup Id="lib_python"> + <MsiPackage Id="lib_python_AllUsers" + SourceFile="lib_python.msi" + Compressed="$(var.CompressMSI)" + DownloadUrl="$(var.DownloadUrl)" + ForcePerMachine="yes" + InstallCondition="InstallAllUsers and Include_lib_python and not LauncherOnly"> + <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> + </MsiPackage> + <MsiPackage Id="lib_python_JustForMe" + SourceFile="lib_python.msi" + Compressed="$(var.CompressMSI)" + DownloadUrl="$(var.DownloadUrl)" + ForcePerMachine="no" + InstallCondition="not InstallAllUsers and Include_lib_python 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/libs.wxs b/pypy/tool/release/windowsinstaller/bundle/packagegroups/libs.wxs new file mode 100644 --- /dev/null +++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/libs.wxs @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <PackageGroup Id="libs"> + <MsiPackage Id="libs_AllUsers" + SourceFile="exe.msi" + Compressed="$(var.CompressMSI)" + DownloadUrl="$(var.DownloadUrl)" + ForcePerMachine="yes" + InstallCondition="InstallAllUsers and Include_libs and not LauncherOnly"> + <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" /> + </MsiPackage> + <MsiPackage Id="libs_JustForMe" + SourceFile="libs.msi" + Compressed="$(var.CompressMSI)" + DownloadUrl="$(var.DownloadUrl)" + ForcePerMachine="no" + InstallCondition="not InstallAllUsers and Include_libs 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/libs/libs.wixproj b/pypy/tool/release/windowsinstaller/libs/libs.wixproj new file mode 100644 --- /dev/null +++ b/pypy/tool/release/windowsinstaller/libs/libs.wixproj @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectGuid>{6EE63EEF-D6C5-4E96-840B-BFDE73B9068F}</ProjectGuid> + <SchemaVersion>2.0</SchemaVersion> + <OutputName Condition="'$(OutputName)' == ''">libs</OutputName> + <OutputType>Package</OutputType> + </PropertyGroup> + <Import Project="..\msi.props" /> + <ItemGroup> + <Compile Include="libs.wxs" /> + <Compile Include="libs_files.wxs" /> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="*.wxl" /> + </ItemGroup> + <Import Project="..\msi.targets" /> +</Project> \ No newline at end of file diff --git a/pypy/tool/release/windowsinstaller/libs/libs.wxs b/pypy/tool/release/windowsinstaller/libs/libs.wxs new file mode 100644 --- /dev/null +++ b/pypy/tool/release/windowsinstaller/libs/libs.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="libs" /> + <ComponentRef Id="OptionalFeature" /> + </Feature> + </Product> +</Wix> diff --git a/pypy/tool/release/windowsinstaller/libs/libs_en-US.wxl b/pypy/tool/release/windowsinstaller/libs/libs_en-US.wxl new file mode 100644 --- /dev/null +++ b/pypy/tool/release/windowsinstaller/libs/libs_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">Libraries</String> + <String Id="ShortDescriptor">libs</String> +</WixLocalization> diff --git a/pypy/tool/release/windowsinstaller/libs/libs_files.wxs b/pypy/tool/release/windowsinstaller/libs/libs_files.wxs new file mode 100644 --- /dev/null +++ b/pypy/tool/release/windowsinstaller/libs/libs_files.wxs @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <ComponentGroup Id="libs"> + <Component Id="python_lib" Directory="InstallDirectory" Guid="$(var.PythonExeComponentGuid)"> + <File Id="python_lib" Name="python.lib" Source="!(bindpath.src)libs\python35.lib" KeyPath="yes" /> + </Component> + </ComponentGroup> + </Fragment> +</Wix> _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit