Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r63008:c371b51f6734
Date: 2013-04-04 12:59 +0200
http://bitbucket.org/pypy/pypy/changeset/c371b51f6734/
Log: fix packaging to include .so
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -25,7 +25,6 @@
line = ''
return '%s%s' % (line, self.args[0])
-
class FFI(object):
r'''
The main top-level class that you instantiate once, or once per module.
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -17,6 +17,7 @@
import py
import fnmatch
from rpython.tool.udir import udir
+import subprocess
if sys.version_info < (2,6): py.test.skip("requires 2.6 so far")
@@ -64,6 +65,8 @@
raise PyPyCNotFound(
'Bogus path: %r does not exist (see docstring for more info)'
% (os.path.dirname(str(pypy_c)),))
+ subprocess.check_call([str(pypy_c), '-c', 'import _sqlite3'])
+ subprocess.check_call([str(pypy_c), '-c', 'import _curses'])
if sys.platform == 'win32' and not rename_pypy_c.lower().endswith('.exe'):
rename_pypy_c += '.exe'
binaries = [(pypy_c, rename_pypy_c)]
@@ -73,9 +76,9 @@
#Instructions are provided on the website.
# Can't rename a DLL: it is always called 'libpypy-c.dll'
-
+
for extra in ['libpypy-c.dll',
- 'libexpat.dll', 'sqlite3.dll',
+ 'libexpat.dll', 'sqlite3.dll',
'libeay32.dll', 'ssleay32.dll']:
p = pypy_c.dirpath().join(extra)
if not p.check():
@@ -93,7 +96,8 @@
ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~'))
shutil.copytree(str(basedir.join('lib_pypy')),
str(pypydir.join('lib_pypy')),
- ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~'))
+ ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~',
+ '*.c', '*.o'))
for file in ['LICENSE', 'README.rst']:
shutil.copy(str(basedir.join(file)), str(pypydir))
pypydir.ensure('include', dir=True)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
