Author: [email protected]
Branch: windowsinstaller
Changeset: r95818:d5fcd44841c2
Date: 2019-01-02 14:28 +0000
http://bitbucket.org/pypy/pypy/changeset/d5fcd44841c2/
Log: Added path. Fixed some file names.
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
@@ -68,6 +68,7 @@
<Package Include="..\lib_python\lib_python*.wixproj" />
<Package Include="..\libs\libs*.wixproj" />
<Package Include="..\site_packages\site_packages*.wixproj" />
+ <Package Include="..\path\path*.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
@@ -62,16 +62,13 @@
<Variable Name="TargetDirState" Value="enabled" />
<Variable Name="CustomBrowseButtonState" Value="enabled" />
- <Variable Name="Include_core" Value="1" />
<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_python" 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" />
- <Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" />
- <Variable Name="Include_pip" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_lib_pypy" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_external" Value="1" bal:Overridable="yes" />
+ <Variable Name="Include_sitepackages" 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" />
@@ -101,7 +98,8 @@
<PackageGroupRef Id="lib_python" />
<PackageGroupRef Id="libs" />
<PackageGroupRef Id="external" />
- <PackageGroupRef Id="site-packages" />
+ <PackageGroupRef Id="site_packages" />
+ <PackageGroupRef Id="postinstall" />
</Chain>
</Bundle>
</Wix>
diff --git
a/pypy/tool/release/windowsinstaller/bundle/packagegroups/postinstall.wxs
b/pypy/tool/release/windowsinstaller/bundle/packagegroups/postinstall.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/postinstall.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <Fragment>
+ <PackageGroup Id="postinstall">
+ <MsiPackage Id="path_AllUsers"
+ SourceFile="path.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="yes"
+ InstallCondition="InstallAllUsers and PrependPath and
not LauncherOnly">
+ <MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
+ <MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
+ </MsiPackage>
+ <MsiPackage Id="path_JustForMe"
+ SourceFile="path.msi"
+ Compressed="$(var.CompressMSI)"
+ DownloadUrl="$(var.DownloadUrl)"
+ ForcePerMachine="no"
+ InstallCondition="not InstallAllUsers and PrependPath
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/common.wxs
b/pypy/tool/release/windowsinstaller/common.wxs
--- a/pypy/tool/release/windowsinstaller/common.wxs
+++ b/pypy/tool/release/windowsinstaller/common.wxs
@@ -85,7 +85,11 @@
<Directory Id="lib_python" Name="lib-python" />
</DirectoryRef>
</Fragment>
-
+ <Fragment>
+ <DirectoryRef Id="InstallDirectory">
+ <Directory Id="site_packages" Name="site-packages" />
+ </DirectoryRef>
+ </Fragment>
<Fragment>
<DirectoryRef Id="InstallDirectory">
<Directory Id="Lib" Name="Lib" />
diff --git a/pypy/tool/release/windowsinstaller/exe/exe.wxs
b/pypy/tool/release/windowsinstaller/exe/exe.wxs
--- a/pypy/tool/release/windowsinstaller/exe/exe.wxs
+++ b/pypy/tool/release/windowsinstaller/exe/exe.wxs
@@ -19,7 +19,7 @@
<Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)"
Description="!(loc.Description)">
<ComponentGroupRef Id="exe_pypy" />
<Component Id="exe_shortcut" Directory="MenuDir" Guid="*">
- <Shortcut Id="pypy3_c_shortcut"
+ <Shortcut Id="pypy3_c"
Target="[#pypy3_c]"
Name="!(loc.ShortcutName)"
Description="!(loc.ShortcutDescription)"
diff --git a/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
b/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
--- a/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
+++ b/pypy/tool/release/windowsinstaller/exe/exe_files.wxs
@@ -22,7 +22,7 @@
</RegistryKey>
</Component>
<Component Id="exe_pypycw" Directory="InstallDirectory"
Guid="$(var.PythonwExeComponentGuid)">
- <File Id="pypy3_cw" Name="pypy3-cw"
Source="!(bindpath.goal)pypy3-cw.exe" KeyPath="yes" />
+ <File Id="pypy3_cw" Name="pypy3-cw.exe"
Source="!(bindpath.goal)pypy3-cw.exe" KeyPath="yes" />
<RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
<RegistryValue Key="InstallPath"
Name="WindowedExecutablePath" Type="string" Value="[#pypy3_cw]" KeyPath="no" />
</RegistryKey>
diff --git a/pypy/tool/release/windowsinstaller/external/external_files.wxs
b/pypy/tool/release/windowsinstaller/external/external_files.wxs
--- a/pypy/tool/release/windowsinstaller/external/external_files.wxs
+++ b/pypy/tool/release/windowsinstaller/external/external_files.wxs
@@ -3,13 +3,13 @@
<Fragment>
<ComponentGroup Id="external">
<Component Id="sqlite3" Directory="InstallDirectory" Guid="*">
- <File Name="sqlite3"
Source="!(bindpath.src)externals\lib\sqlite3.lib" KeyPath="yes" />
+ <File Name="sqlite3.lib"
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" />
+ <File Name="tcl85.dll"
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" />
+ <File Name="tk85.dll"
Source="!(bindpath.src)externals\bin\tk85.dll" KeyPath="yes" />
</Component>
</ComponentGroup>
</Fragment>
diff --git a/pypy/tool/release/windowsinstaller/lib_pypy/lib_pypy.wixproj
b/pypy/tool/release/windowsinstaller/lib_pypy/lib_pypy.wixproj
--- a/pypy/tool/release/windowsinstaller/lib_pypy/lib_pypy.wixproj
+++ b/pypy/tool/release/windowsinstaller/lib_pypy/lib_pypy.wixproj
@@ -14,7 +14,7 @@
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
- <InstallFiles Include="$(PySourcePath)include\**\*">
+ <InstallFiles Include="$(PySourcePath)lib_pypy\**\*">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
diff --git a/pypy/tool/release/windowsinstaller/path/path.wixproj
b/pypy/tool/release/windowsinstaller/path/path.wixproj
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/path/path.wixproj
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <ProjectGuid>{91C99298-8E2E-4422-A5AF-CC4FFF9A58D3}</ProjectGuid>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputName>path</OutputName>
+ <OutputType>Package</OutputType>
+ <SuppressIces>ICE71</SuppressIces>
+ </PropertyGroup>
+ <Import Project="..\msi.props" />
+ <ItemGroup>
+ <Compile Include="*.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/path/path.wxs
b/pypy/tool/release/windowsinstaller/path/path.wxs
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/path/path.wxs
@@ -0,0 +1,39 @@
+<?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)" />
+
+ <PropertyRef Id="UpgradeTable" />
+ <PropertyRef Id="REGISTRYKEY" />
+
+ <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)"
Description="!(loc.Description)">
+ <Component Id="PrependPath_CU" Directory="InstallDirectory"
Guid="*">
+ <Condition>NOT ALLUSERS=1</Condition>
+ <RegistryKey Root="HKCU" Key="[REGISTRYKEY]">
+ <RegistryValue KeyPath="yes" Key="InstalledFeatures"
Name="$(var.OptionalFeatureName)" Value="$(var.Version)" Type="string" />
+ </RegistryKey>
+
+ <CreateFolder Directory="Scripts" />
+ <RemoveFolder Id="Remove_Scripts_CU" Directory="Scripts"
On="uninstall" />
+
+ <Environment Id="PATH_CU" Action="set" Name="PATH"
Part="first" Value="[InstallDirectory]" />
+ <Environment Id="SCRIPTS_PATH_CU" Action="set" Name="PATH"
Part="first" Value="[Scripts]" />
+ </Component>
+ <Component Id="PrependPath_LM" Directory="InstallDirectory"
Guid="*">
+ <Condition>ALLUSERS=1</Condition>
+ <RegistryKey Root="HKLM" Key="[REGISTRYKEY]">
+ <RegistryValue KeyPath="yes" Key="InstalledFeatures"
Name="$(var.OptionalFeatureName)" Value="$(var.Version)" Type="string" />
+ </RegistryKey>
+
+ <CreateFolder Directory="Scripts" />
+ <RemoveFolder Id="Remove_Scripts_LM" Directory="Scripts"
On="uninstall" />
+
+ <Environment Id="PATH_LM" Action="set" Name="PATH"
Part="first" Value="[InstallDirectory]" System="yes" />
+ <Environment Id="SCRIPTS_PATH_LM" Action="set" Name="PATH"
Part="first" Value="[Scripts]" System="yes" />
+ <Environment Id="PY_PATHEXT_LM" Action="set" Name="PATHEXT"
Part="last" Value=".PY" System="yes" />
+ <Environment Id="PYW_PATHEXT_LM" Action="set" Name="PATHEXT"
Part="last" Value=".PYW" System="yes" />
+ </Component>
+ </Feature>
+ </Product>
+</Wix>
+
diff --git a/pypy/tool/release/windowsinstaller/path/path_en-US.wxl
b/pypy/tool/release/windowsinstaller/path/path_en-US.wxl
new file mode 100644
--- /dev/null
+++ b/pypy/tool/release/windowsinstaller/path/path_en-US.wxl
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us"
xmlns="http://schemas.microsoft.com/wix/2006/localization";>
+ <String Id="Descriptor">Add to Path</String>
+ <String Id="ShortDescriptor">Path</String>
+ <String Id="NoPython">No !(loc.ProductName) installation was
detected.</String>
+</WixLocalization>
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
