Author: andrew.lawre...@siemens.com
Branch: windowsinstaller
Changeset: r95820:c5555c37b0cf
Date: 2019-01-06 20:11 +0000
http://bitbucket.org/pypy/pypy/changeset/c5555c37b0cf/
Log: Fixed issue with lib_pypy directory
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,6 +85,11 @@
<Directory Id="lib_python" Name="lib-python" />
</DirectoryRef>
</Fragment>
+ <Fragment>
+ <DirectoryRef Id="InstallDirectory">
+ <Directory Id="lib_pypy" Name="lib_pypy" />
+ </DirectoryRef>
+ </Fragment>
<Fragment>
<DirectoryRef Id="InstallDirectory">
<Directory Id="site_packages" Name="site-packages" />
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,11 @@
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
- <InstallFiles Include="$(PySourcePath)lib_pypy\**\*">
+ <InstallFiles Include="$(PySourcePath)lib_pypy\**\*"
+ Exclude="$(PySourcePath)lib_pypy\**\*.pyc;
+ $(PySourcePath)lib_pypy\**\*.pyo;
+
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
+
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
