[pypy-svn] r75477 - in pypy/release/1.3.x: . lib-python/modified-2.5.2/distutils pypy/tool/release pypy/tool/release/test
fijal at codespeak.net
fijal at codespeak.net
Sun Jun 20 07:43:42 CEST 2010
Author: fijal
Date: Sun Jun 20 07:43:40 2010
New Revision: 75477
Modified:
pypy/release/1.3.x/ (props changed)
pypy/release/1.3.x/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py
pypy/release/1.3.x/pypy/tool/release/package.py (contents, props changed)
pypy/release/1.3.x/pypy/tool/release/test/test_package.py (props changed)
Log:
Merge r75475 and r75476 from trunk
Modified: pypy/release/1.3.x/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py
==============================================================================
--- pypy/release/1.3.x/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py (original)
+++ pypy/release/1.3.x/lib-python/modified-2.5.2/distutils/sysconfig_pypy.py Sun Jun 20 07:43:40 2010
@@ -13,6 +13,9 @@
def get_python_inc(plat_specific=0, prefix=None):
from os.path import join as j
+ cand = j(sys.pypy_prefix, 'include')
+ if os.path.exists(cand):
+ return cand
if plat_specific:
return j(sys.pypy_prefix, "pypy", "_interfaces")
return j(sys.pypy_prefix, 'pypy', 'module', 'cpyext', 'include')
Modified: pypy/release/1.3.x/pypy/tool/release/package.py
==============================================================================
--- pypy/release/1.3.x/pypy/tool/release/package.py (original)
+++ pypy/release/1.3.x/pypy/tool/release/package.py Sun Jun 20 07:43:40 2010
@@ -34,8 +34,12 @@
def package(basedir, name='pypy-nightly', rename_pypy_c='pypy-c',
copy_to_dir = None, override_pypy_c = None):
basedir = py.path.local(basedir)
+ if sys.platform == 'win32':
+ basename = 'pypy-c.exe'
+ else:
+ basename = 'pypy-c'
if override_pypy_c is None:
- pypy_c = basedir.join('pypy', 'translator', 'goal', 'pypy-c')
+ pypy_c = basedir.join('pypy', 'translator', 'goal', basename)
else:
pypy_c = py.path.local(override_pypy_c)
if not pypy_c.check():
@@ -53,6 +57,13 @@
ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~'))
for file in ['LICENSE', 'README']:
shutil.copy(str(basedir.join(file)), str(pypydir))
+ pypydir.ensure('include', dir=True)
+ # we want to put there all *.h from module/cpyext/include
+ # and from pypy/_interfaces
+ for n in basedir.join('pypy', 'module', 'cpyext', 'include').listdir('*.h'):
+ shutil.copy(str(n), str(pypydir.join('include')))
+ for n in basedir.join('pypy', '_interfaces').listdir('*.h'):
+ shutil.copy(str(n), str(pypydir.join('include')))
pypydir.ensure('bin', dir=True)
archive_pypy_c = pypydir.join('bin', rename_pypy_c)
shutil.copy(str(pypy_c), str(archive_pypy_c))
More information about the Pypy-commit
mailing list