[pypy-commit] pypy win32-cleanup_2: (sthalik) do not hardcode lib name

mattip noreply at buildbot.pypy.org
Fri Feb 17 12:13:50 CET 2012


Author: mattip
Branch: win32-cleanup_2
Changeset: r52579:18656f8fe732
Date: 2012-02-17 13:13 +0200
http://bitbucket.org/pypy/pypy/changeset/18656f8fe732/

Log:	(sthalik) do not hardcode lib name

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
@@ -83,7 +83,7 @@
         shutil.copy(str(basedir.join(file)), str(pypydir))
     pypydir.ensure('include', dir=True)
     if sys.platform == 'win32':
-        shutil.copyfile(str(pypy_c.dirpath().join("python27.lib")),
+        shutil.copyfile(str(pypy_c.dirpath().join("libpypy-c.lib"))),
                         str(pypydir.join('include/python27.lib')))
     # we want to put there all *.h and *.inl from trunk/include
     # and from pypy/_interfaces
diff --git a/pypy/translator/driver.py b/pypy/translator/driver.py
--- a/pypy/translator/driver.py
+++ b/pypy/translator/driver.py
@@ -560,8 +560,8 @@
                 shutil.copy(str(soname), str(newsoname))
                 self.log.info("copied: %s" % (newsoname,))
                 if sys.platform == 'win32':
-                    shutil.copyfile(os.path.join(os.path.dirname(str(exename)), 'libpypy-c.lib'),
-                                    os.path.join(os.path.dirname(str(newexename)), 'python27.lib'))
+                    shutil.copyfile(soname.new(ext='lib'),
+                                    newsoname.new(ext='lib'))
             self.c_entryp = newexename
         self.log.info('usession directory: %s' % (udir,))
         self.log.info("created: %s" % (self.c_entryp,))


More information about the pypy-commit mailing list