cleanup - reformatting (reapplied after RN-VZ mega-update)

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 52f77cf5b624f5b3d16e6969940e97cf7d325d52..cdaa055bfcc22de696f76fe978db62d99d996561 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -76,6 +76,32 @@ RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 CLEANUP.append('wx/__version__.py')
 
 
+#----------------------------------------------------------------------
+# Write the SWIG version to a header file
+#----------------------------------------------------------------------
+
+if USE_SWIG:
+    try:
+        # It may come on either stdout or stderr, depending on the
+        # version, so read both.
+        i, o, e = os.popen3(SWIG + ' -version', 't')
+        stext = o.read() + e.read()
+        import re
+        match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE)
+        if not match:
+            raise 'NotFound'
+        SVER = match.group(0)
+        open('include/wx/wxPython/swigver.h', 'w').write('''\
+// This file was generated by setup.py
+
+#define wxPy_SWIG_VERSION "SWIG-%s"
+''' % SVER)
+        msg('Using SWIG-' + SVER)
+
+    except:
+        msg('\nUnable to get SWIG version number\n')
+
+
 #----------------------------------------------------------------------
 # patch distutils if it can't cope with the "classifiers" or
 # "download_url" keywords 
@@ -454,8 +480,9 @@ if BUILD_GLCANVAS:
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
-        gl_lflags = gl_config.split() + lflags
+        gl_lflags = gl_config.split()
         gl_libs = libs
+        
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags