Commits

Alex Gaynor committed 2888943 Merge

merged default in

Comments (0)

Files changed (2)

pypy/doc/whatsnew-head.rst

 .. 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
 

pypy/tool/release/package.py

 
 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():