diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-05-18 08:07:46 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-05-18 08:07:46 (GMT) |
| commit | d18a84ee16bf6d8e8e86aba981afa8a865f27efd (patch) | |
| tree | 49d9ce9f0c65c3485d8aa74227d4603c1ecc21fb /Lib/distutils | |
| parent | 5483fe55f5d5fbb2383640a4f3508d0de29f4453 (diff) | |
| download | cpython-d18a84ee16bf6d8e8e86aba981afa8a865f27efd.zip cpython-d18a84ee16bf6d8e8e86aba981afa8a865f27efd.tar.gz cpython-d18a84ee16bf6d8e8e86aba981afa8a865f27efd.tar.bz2 | |
Merged revisions 72758 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72758 | tarek.ziade | 2009-05-18 10:03:37 +0200 (Mon, 18 May 2009) | 1 line
Fixed the library extension when distutils build_ext is used inplace
........
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 3 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index c39bd72..eb4cb05 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -636,7 +636,8 @@ class build_ext(Command): base = modpath[-1] build_py = self.get_finalized_command('build_py') package_dir = os.path.abspath(build_py.get_package_dir(package)) - return os.path.join(package_dir, base) + filename = self.get_ext_filename(ext_name) + return os.path.join(package_dir, filename) else: filename = self.get_ext_filename(ext_name) return os.path.join(self.build_lib, filename) diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 764aa72..add2923 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -20,12 +20,6 @@ from test import support # Don't load the xx module more than once. ALREADY_TESTED = False -if sys.platform != 'win32': - UNDER_MSVC8 = False -else: - from distutils.msvccompiler import get_build_version - UNDER_MSVC8 = get_build_version() < 8.0 - def _get_source_filename(): srcdir = sysconfig.get_config_var('srcdir') return os.path.join(srcdir, 'Modules', 'xxmodule.c') @@ -299,7 +293,6 @@ class BuildExtTestCase(TempdirManager, cmd.run() self.assertEquals(cmd.compiler, 'unix') - @unittest.skipIf(UNDER_MSVC8, 'not running this test for MSVC < 8') def test_get_outputs(self): tmp_dir = self.mkdtemp() c_file = os.path.join(tmp_dir, 'foo.c') @@ -329,6 +322,8 @@ class BuildExtTestCase(TempdirManager, finally: os.chdir(old_wd) self.assert_(os.path.exists(so_file)) + self.assertEquals(os.path.splitext(so_file)[-1], + sysconfig.get_config_var('SO')) so_dir = os.path.dirname(so_file) self.assertEquals(so_dir, other_tmp_dir) @@ -336,6 +331,8 @@ class BuildExtTestCase(TempdirManager, cmd.run() so_file = cmd.get_outputs()[0] self.assert_(os.path.exists(so_file)) + self.assertEquals(os.path.splitext(so_file)[-1], + sysconfig.get_config_var('SO')) so_dir = os.path.dirname(so_file) self.assertEquals(so_dir, cmd.build_lib) |