[pypy-svn] r75520 - in pypy/branch/sys-prefix/pypy/tool: . test

[antocuni at codespeak.net]

Author: antocuni
Date: Wed Jun 23 10:56:32 2010
New Revision: 75520

Modified:
   pypy/branch/sys-prefix/pypy/tool/package.py
   pypy/branch/sys-prefix/pypy/tool/test/test_package.py
Log:
fix package.py for the new directory layout


Modified: pypy/branch/sys-prefix/pypy/tool/package.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/tool/package.py	(original)
+++ pypy/branch/sys-prefix/pypy/tool/package.py	Wed Jun 23 10:56:32 2010
@@ -40,8 +40,11 @@
     pypydir = builddir.ensure(name, dir=True)
     # Careful: to copy lib_pypy, copying just the svn-tracked files
     # would not be enough: there are also ctypes_config_cache/_*_cache.py.
-    shutil.copytree(str(basedir.join('lib')),
-                    str(pypydir.join('lib')),
+    shutil.copytree(str(basedir.join('lib-python')),
+                    str(pypydir.join('lib-python')),
+                    ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~'))
+    shutil.copytree(str(basedir.join('lib_pypy')),
+                    str(pypydir.join('lib_pypy')),
                     ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~'))
     for file in ['LICENSE', 'README']:
         shutil.copy(str(basedir.join(file)), str(pypydir))

Modified: pypy/branch/sys-prefix/pypy/tool/test/test_package.py
==============================================================================
--- pypy/branch/sys-prefix/pypy/tool/test/test_package.py	(original)
+++ pypy/branch/sys-prefix/pypy/tool/test/test_package.py	Wed Jun 23 10:56:32 2010
@@ -2,7 +2,7 @@
 import py
 from pypy.tool.autopath import pypydir
 from pypy.tool.package import main
-from pypy.module.sys.version import PYPY_VERSION, CPYTHON_VERSION
+from pypy.module.sys.version import  CPYTHON_VERSION
 import tarfile, os
 
 def test_dir_structure():
@@ -16,17 +16,16 @@
     try:
         builddir = main(py.path.local(pypydir).dirpath(), 'test')
         prefix = builddir.join('test')
-        pypyxy = 'pypy%d.%d' % PYPY_VERSION[:2]
         cpyver = '%d.%d.%d' % CPYTHON_VERSION[:3]
-        assert prefix.join('lib', pypyxy, 'lib-python', cpyver, 'test').check()
+        assert prefix.join('lib-python', cpyver, 'test').check()
         assert prefix.join('bin', 'pypy-c').check()
-        assert prefix.join('lib', pypyxy, 'lib_pypy', 'syslog.py').check()
-        assert not prefix.join('lib', pypyxy, 'lib_pypy', 'py').check()
-        assert not prefix.join('lib', pypyxy, 'lib_pypy', 'ctypes_configure').check()
+        assert prefix.join('lib_pypy', 'syslog.py').check()
+        assert not prefix.join('lib_pypy', 'py').check()
+        assert not prefix.join('lib_pypy', 'ctypes_configure').check()
         assert prefix.join('LICENSE').check()
         assert prefix.join('README').check()
         th = tarfile.open(str(builddir.join('test.tar.bz2')))
-        assert th.getmember('test/lib/%s/lib_pypy/syslog.py' % pypyxy)
+        assert th.getmember('test/lib_pypy/syslog.py')
     finally:
         if fake_pypy_c:
             pypy_c.remove()