[pypy-commit] pypy windowsinstaller: Additional files from cpython
andr...@siemens.com
pypy.commits at gmail.com
Tue Feb 5 05:58:03 EST 2019
Author: andrew.lawrence at siemens.com
Branch: windowsinstaller
Changeset: r95803:536b0f301622
Date: 2018-12-24 21:07 +0000
http://bitbucket.org/pypy/pypy/changeset/536b0f301622/
Log: Additional files from cpython
diff --git a/pypy/tool/release/windowsinstaller/bundle/bundle.targets b/pypy/tool/release/windowsinstaller/bundle/bundle.targets
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/bundle.targets
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="DownloadUrl">
+ <PropertyGroup>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputType>Bundle</OutputType>
+
+ <BootstrapConfiguration Condition="'$(BootstrapConfiguration)' == ''">Release</BootstrapConfiguration>
+ <LinkerSuppressSpecificWarnings>1132;1135;1140</LinkerSuppressSpecificWarnings>
+ <OutputName Condition="$(BuildForRelease)">$(OutputName)-$(PythonVersion)</OutputName>
+ <OutputName Condition="!$(BuildForRelease)">$(OutputName)-$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber).$(RevisionNumber)</OutputName>
+ <OutputName Condition="$(Platform) == 'x64'">$(OutputName)-amd64</OutputName>
+ <OutputName Condition="'$(OutputSuffix)' != ''">$(OutputName)-$(OutputSuffix)</OutputName>
+ <OutputName Condition="'$(Configuration)' == 'Debug'">$(OutputName)-d</OutputName>
+ <TargetName>$(OutputName)</TargetName>
+
+ <OutputPath>$(OutputPath)en-us\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+
+ <!-- See Tools/msi/buildrelease.bat for help on configuring the download URL -->
+ <DownloadUrl Condition="'$(DownloadUrl)' == '' and '$(DownloadUrlBase)' != ''">$(DownloadUrlBase.TrimEnd(`/`))/{version}/{arch}{releasename}/{msi}</DownloadUrl>
+ <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, `{2}`))</DefineConstants>
+ <DefineConstants Condition="'$(DownloadUrl)' == ''">$(DefineConstants);DownloadUrl={2}</DefineConstants>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <WixExtension Include="WixUtilExtension">
+ <HintPath>WixUtilExtension</HintPath>
+ <Name>WixUtilExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixDependencyExtension">
+ <HintPath>WixDependencyExtension</HintPath>
+ <Name>WixDependencyExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixBalExtension">
+ <HintPath>WixBalExtension</HintPath>
+ <Name>WixBalExtension</Name>
+ </WixExtension>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="bundle.wxs" />
+ <Compile Include="packagegroups\*.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="Default.thm" />
+ <Content Include="Default.wxl" />
+ <Content Include="SideBar.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="bundle.wxl" />
+ <WxlTemplate Include="*_en-US.wxl_template" />
+ </ItemGroup>
+ <ItemGroup>
+ <LinkerBindInputPaths Include="$(OutputPath)">
+ <BindName></BindName>
+ </LinkerBindInputPaths>
+ </ItemGroup>
+
+ <ItemDefinitionGroup>
+ <Package>
+ <Properties>BuildForRelease=$(BuildForRelease)</Properties>
+ </Package>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <Package Include="..\include\include*.wixproj" />
+ <Package Include="..\lib_pypy\lib_pypy*.wixproj" />
+ </ItemGroup>
+
+ <PropertyGroup>
+ <BuildPackagesTargets>Build</BuildPackagesTargets>
+ </PropertyGroup>
+
+ <Target Name="_SetRebuildTarget" BeforeTargets="BeforeRebuild">
+ <PropertyGroup>
+ <BuildPackagesTargets>Rebuild</BuildPackagesTargets>
+ </PropertyGroup>
+ </Target>
+
+ <Target Name="BuildPackages" BeforeTargets="BeforeBuild" Condition="'$(RebuildAll)' != 'false'">
+ <MSBuild Projects="@(Package)" Targets="$(BuildPackagesTargets)" BuildInParallel="true" />
+ </Target>
+
+ <Target Name="BuildBootstrapApplication" BeforeTargets="BeforeBuild">
+ <Message Text="Building bootstrap app" Importance="high" />
+
+ <MSBuild Projects="bootstrap\pythonba.vcxproj"
+ Targets="Build;GetNativeTargetPath"
+ UseResultsCache="true"
+ Properties="Configuration=$(BootstrapConfiguration);Platform=Win32">
+ <Output TaskParameter="TargetOutputs" PropertyName="BootstrapAppPath" />
+ </MSBuild>
+
+ <PropertyGroup>
+ <DefineConstants>$(DefineConstants);BootstrapApp=$(BootstrapAppPath)</DefineConstants>
+ </PropertyGroup>
+ </Target>
+
+ <Import Project="..\msi.targets" />
+</Project>
\ No newline at end of file
diff --git a/pypy/tool/release/windowsinstaller/bundle/bundle.wxl b/pypy/tool/release/windowsinstaller/bundle/bundle.wxl
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/bundle.wxl
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+ <String Id="CRTDescription">C Runtime Update (KB2999226)</String>
+ <String Id="CompileAllDescription">Precompiling standard library</String>
+ <String Id="CompileAllODescription">Precompiling standard library (-O)</String>
+ <String Id="CompileAllOODescription">Precompiling standard library (-OO)</String>
+</WixLocalization>
diff --git a/pypy/tool/release/windowsinstaller/bundle/bundle.wxs b/pypy/tool/release/windowsinstaller/bundle/bundle.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/bundle.wxs
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
+ xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
+ <Bundle Name="!(loc.FullProductName)"
+ UpgradeCode="$(var.CoreUpgradeCode)"
+ Version="$(var.Version)"
+ IconSourceFile="..\..\..\PC\icons\setup.ico"
+ Manufacturer="!(loc.Manufacturer)"
+ AboutUrl="http://www.python.org/"
+ Compressed="no"
+ dep:ProviderKey="CPython-$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)">
+ <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)">
+ <Payload Compressed='yes' SourceFile='Default.thm' />
+ <Payload Compressed='yes' SourceFile='Default.wxl' />
+ <Payload Compressed='yes' SourceFile='SideBar.png' />
+ </BootstrapperApplication>
+
+ <!-- May be set to "Removing" or "Repairing" -->
+ <Variable Name="ActionLikeInstalling" Value="Installing" />
+ <!-- May be set to "Uninstallation" or "Repair" -->
+ <Variable Name="ActionLikeInstallation" Value="Setup" />
+
+ <Variable Name="ShortVersion" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)" />
+ <Variable Name="ShortVersionNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)" />
+ <Variable Name="WinVer" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" />
+ <Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" />
+
+ <Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" />
+ <?if "$(var.PyTestExt)"="" ?>
+ <Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" />
+ <?else ?>
+ <Variable Name="InstallLauncherAllUsers" Value="0" />
+ <?endif ?>
+ <Variable Name="TargetDir" Value="" bal:Overridable="yes" />
+ <?if $(var.Platform)~="x64" ?>
+ <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]Python[WinVerNoDot]" bal:Overridable="yes" />
+ <Variable Name="TargetPlatform" Value="x64" />
+ <?else ?>
+ <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]Python[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" />
+
+ <!--
+ An empty string will use the other defaults based on InstallAllUsers
+ (and switch dynamically in the UI). To get the old default, pass
+ this property on the command line:
+ DefaultCustomTargetDir=[WindowsVolume]Python[ShortVersionNoDot]
+ -->
+ <Variable Name="DefaultCustomTargetDir" Value="" bal:Overridable="yes" />
+
+ <Variable Name="InstallAllUsersState" Value="enabled" bal:Overridable="yes" />
+ <?if "$(var.PyTestExt)"="" ?>
+ <Variable Name="InstallLauncherAllUsersState" Value="enabled" bal:Overridable="yes" />
+ <?else ?>
+ <Variable Name="InstallLauncherAllUsersState" Value="disable" bal:Overridable="yes" />
+ <?endif ?>
+ <Variable Name="CustomInstallLauncherAllUsersState" Value="[InstallLauncherAllUsersState]" />
+ <Variable Name="TargetDirState" Value="enabled" />
+ <Variable Name="CustomBrowseButtonState" Value="enabled" />
+
+ <Variable Name="Include_core" 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_test" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_doc" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_tools" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_pip" Value="1" bal:Overridable="yes" />
+ <?if "$(var.PyTestExt)"="" ?>
+ <Variable Name="Include_launcher" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_launcherState" Value="enabled" bal:Overridable="yes" />
+ <?else ?>
+ <Variable Name="Include_launcher" Value="0" />
+ <Variable Name="Include_launcherState" Value="disable" />
+ <?endif ?>
+ <Variable Name="Include_symbols" Value="0" bal:Overridable="yes" />
+ <Variable Name="Include_debug" Value="0" bal:Overridable="yes" />
+
+ <Variable Name="LauncherOnly" Value="0" bal:Overridable="yes" />
+ <Variable Name="DetectedLauncher" Value="0" />
+ <Variable Name="DetectedOldLauncher" Value="0" />
+
+ <Variable Name="AssociateFiles" Value="1" bal:Overridable="yes" />
+ <Variable Name="Shortcuts" Value="1" bal:Overridable="yes" />
+ <Variable Name="PrependPath" Value="0" bal:Overridable="yes" />
+ <Variable Name="CompileAll" Value="0" bal:Overridable="yes" />
+
+ <Variable Name="SimpleInstall" Value="0" bal:Overridable="yes" />
+ <Variable Name="SimpleInstallDescription" Value="" bal:Overridable="yes" />
+
+ <Chain ParallelCache="yes">
+ <PackageGroupRef Id="include" />
+ <PackageGroupRef Id="lib_pypy" />
+ </Chain>
+ </Bundle>
+</Wix>
diff --git a/pypy/tool/release/windowsinstaller/bundle/packagegroups/include.wxs b/pypy/tool/release/windowsinstaller/bundle/packagegroups/include.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/include.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <PackageGroup Id="include">
+ <MsiPackage Id="include_AllUsers"
+ SourceFile="include.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="yes"
+ InstallCondition="InstallAllUsers and Include_include and not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ <MsiPackage Id="include_JustForMe"
+ SourceFile="include.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="no"
+ InstallCondition="not InstallAllUsers and Include_include 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/lib_pypy.wxs b/pypy/tool/release/windowsinstaller/bundle/packagegroups/lib_pypy.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/lib_pypy.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <PackageGroup Id="lib_pypy">
+ <MsiPackage Id="lib_pypy_AllUsers"
+ SourceFile="lib_pypy.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="yes"
+ InstallCondition="InstallAllUsers and Include_lib_pypy and not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ <MsiPackage Id="lib_pypy_JustForMe"
+ SourceFile="lib_pypy.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="no"
+ InstallCondition="not InstallAllUsers and Include_lib_pypy 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/releaselocal.wixproj b/pypy/tool/release/windowsinstaller/bundle/releaselocal.wixproj
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/releaselocal.wixproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectGuid>{5E95D46C-119F-449E-BE0E-AE92B78570C8}</ProjectGuid>
+ <OutputName>pypy</OutputName>
+ <OutputSuffix></OutputSuffix>
+ </PropertyGroup>
+
+ <Import Project="..\msi.props" />
+
+ <PropertyGroup>
+ <DefineConstants>
+ $(DefineConstants);
+ CompressMSI=yes;
+ CompressPDB=no;
+ CompressMSI_D=no
+ </DefineConstants>
+ </PropertyGroup>
+
+ <Import Project="bundle.targets" />
+</Project>
\ No newline at end of file
More information about the pypy-commit
mailing list