[Python-checkins] r54942 - in python/branches/release25-maint: Lib/distutils/command/build_ext.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Tue Apr 24 17:27:25 2007
New Revision: 54942

Modified:
   python/branches/release25-maint/Lib/distutils/command/build_ext.py
   python/branches/release25-maint/Misc/NEWS
Log:
Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
(as opposed to the command line) will now write file names ending in
".cpp" too.
 (backport from rev. 54941)

Modified: python/branches/release25-maint/Lib/distutils/command/build_ext.py
==============================================================================
--- python/branches/release25-maint/Lib/distutils/command/build_ext.py	(original)
+++ python/branches/release25-maint/Lib/distutils/command/build_ext.py	Tue Apr 24 17:27:25 2007
@@ -533,7 +533,8 @@
         if self.swig_cpp:
             log.warn("--swig-cpp is deprecated - use --swig-opts=-c++")
 
-        if self.swig_cpp or ('-c++' in self.swig_opts):
+        if self.swig_cpp or ('-c++' in self.swig_opts) or \
+           ('-c++' in extension.swig_opts):
             target_ext = '.cpp'
         else:
             target_ext = '.c'

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Apr 24 17:27:25 2007
@@ -12,6 +12,10 @@
 Library
 -------
 
+- Bug #1706381: Specifying the SWIG option "-c++" in the setup.py file
+  (as opposed to the command line) will now write file names ending in
+  ".cpp" too.
+
 - Patch #1695229: Fix a regression with tarfile.open() and a missing name
   argument.