Author: Matti Picus <[email protected]>
Branch:
Changeset: r98389:5bf1495559a4
Date: 2019-12-24 21:10 +0200
http://bitbucket.org/pypy/pypy/changeset/5bf1495559a4/
Log: move build_cffi_imports
diff --git a/pypy/tool/build_cffi_imports.py
b/lib_pypy/tools/build_cffi_imports.py
rename from pypy/tool/build_cffi_imports.py
rename to lib_pypy/tools/build_cffi_imports.py
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
--- a/pypy/doc/build.rst
+++ b/pypy/doc/build.rst
@@ -226,7 +226,7 @@
command::
cd pypy/goal
- PYTHONPATH=../.. ./pypy-c ../tool/build_cffi_imports.py
+ PYTHONPATH=../.. ./pypy-c ../../lib_pypy/tools/build_cffi_imports.py
.. _`out-of-line API mode`:
http://cffi.readthedocs.org/en/latest/overview.html#real-example-api-level-out-of-line
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -91,7 +91,8 @@
set PYPY_GC_MAX_DELTA=200MB
pypy --jit loop_longevity=300 ../../rpython/bin/rpython -Ojit
targetpypystandalone
set PYPY_GC_MAX_DELTA=
- PYTHONPATH=../.. ./pypy-c ../tool/build_cffi_imports.py
+ # This is done as part of translation
+ PYTHONPATH=../.. ./pypy-c ../../lib_pypy/tools/build_cffi_imports.py
.. _build instructions: http://pypy.org/download.html#building-from-source
diff --git a/pypy/goal/targetpypystandalone.py
b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -349,7 +349,8 @@
@taskdef([compile_goal], "Create cffi bindings for modules")
def task_build_cffi_imports(self):
''' Use cffi to compile cffi interfaces to modules'''
- filename = os.path.join(pypydir, 'tool', 'build_cffi_imports.py')
+ filename = os.path.join(pypydir, '..', 'lib_pypy', 'tools',
+ 'build_cffi_imports.py')
if sys.platform == 'darwin':
argv = [filename, '--embed-dependencies']
else:
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -479,11 +479,12 @@
exename = self.c_entryp
newexename = mkexename(self.compute_exe_name())
shutil_copy(str(exename), str(newexename))
+ self.log.info("copied: %s to %s" % (exename, newexename,))
if self.cbuilder.shared_library_name is not None:
soname = self.cbuilder.shared_library_name
newsoname = newexename.new(basename=soname.basename)
shutil_copy(str(soname), str(newsoname))
- self.log.info("copied: %s" % (newsoname,))
+ self.log.info("copied: %s to %s" % (soname, newsoname,))
if sys.platform == 'win32':
# Copy pypyw.exe
newexename = mkexename(self.compute_exe_name(suffix='w'))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
