[Python-checkins] commit of r41384 - in sandbox/trunk/setuptools: . setuptools/command

[phillip.eby@python.org]

Author: phillip.eby
Date: Thu Nov  3 04:55:42 2005
New Revision: 41384

Modified:
   sandbox/trunk/setuptools/EasyInstall.txt
   sandbox/trunk/setuptools/setuptools.txt
   sandbox/trunk/setuptools/setuptools/command/build_ext.py
Log:
Fixed some problems building extensions when Pyrex was installed, especially
with Python 2.4 and/or packages using SWIG.


Modified: sandbox/trunk/setuptools/EasyInstall.txt
==============================================================================
--- sandbox/trunk/setuptools/EasyInstall.txt	(original)
+++ sandbox/trunk/setuptools/EasyInstall.txt	Thu Nov  3 04:55:42 2005
@@ -874,6 +874,9 @@
  * Fixed not fully removing temporary directories on Windows, if a Subversion
    checkout left read-only files behind
 
+ * Fixed some problems building extensions when Pyrex was installed, especially
+   with Python 2.4 and/or packages using SWIG.
+
 0.6a7
  * Fixed not being able to install Windows script wrappers using Python 2.3
 

Modified: sandbox/trunk/setuptools/setuptools.txt
==============================================================================
--- sandbox/trunk/setuptools/setuptools.txt	(original)
+++ sandbox/trunk/setuptools/setuptools.txt	Thu Nov  3 04:55:42 2005
@@ -1873,6 +1873,10 @@
 Release Notes/Change History
 ----------------------------
 
+0.6a8
+ * Fixed some problems building extensions when Pyrex was installed, especially
+   with Python 2.4 and/or packages using SWIG.
+
 0.6a5
  * Fixed missing gui/cli .exe files in distribution.  Fixed bugs in tests.
  

Modified: sandbox/trunk/setuptools/setuptools/command/build_ext.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/build_ext.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/build_ext.py	Thu Nov  3 04:55:42 2005
@@ -1,11 +1,11 @@
-# Attempt to use Pyrex for building extensions, if available
-
+from distutils.command.build_ext import build_ext as _du_build_ext
 try:
+    # Attempt to use Pyrex for building extensions, if available
     from Pyrex.Distutils.build_ext import build_ext as _build_ext
 except ImportError:
-    from distutils.command.build_ext import build_ext as _build_ext
+    _build_ext = _du_build_ext
 
-import os
+import os, sys
 from distutils.file_util import copy_file
 
 class build_ext(_build_ext):
@@ -39,3 +39,44 @@
                 dry_run=self.dry_run
             )
 
+    if _build_ext is not _du_build_ext:
+        # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
+        def swig_sources(self, sources, *otherargs):
+            # first do any Pyrex processing
+            sources = _build_ext.swig_sources(self, sources) or sources
+            # Then do any actual SWIG stuff on the remainder
+            return _du_build_ext.swig_sources(self, sources, *otherargs)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+