Author: Alex Gaynor <[email protected]>
Branch: inline-virtualref-2
Changeset: r60390:28889438d586
Date: 2013-01-23 13:41 -0600
http://bitbucket.org/pypy/pypy/changeset/28889438d586/
Log: merged default in
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,6 +5,9 @@
.. this is a revision shortly after release-2.0-beta1
.. startrev: 0e6161a009c6
+.. branch: split-rpython
+Split rpython and pypy into seperate directories
+
.. branch: callback-jit
Callbacks from C are now better JITted
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
@@ -45,12 +45,12 @@
def package(basedir, name='pypy-nightly', rename_pypy_c='pypy',
copy_to_dir = None, override_pypy_c = None):
- basedir = py.path.local('goal', basedir)
+ basedir = py.path.local(basedir)
if override_pypy_c is None:
basename = 'pypy-c'
if sys.platform == 'win32':
basename += '.exe'
- pypy_c = basedir.join(basename)
+ pypy_c = basedir.join('pypy', 'goal', basename)
else:
pypy_c = py.path.local(override_pypy_c)
if not pypy_c.check():
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
