warning fix

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index b0801e020598f3b1473b2475a8e8de547c81f71e..b9ebe12e749b6193f692380caa36e78ec9428a4a 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -38,8 +38,8 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5

-VER_RELEASE      = 3
-VER_SUBREL       = 3      # wxPython release num for x.y.z release of wxWidgets
+VER_RELEASE      = 4
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets

 VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"


@@ -266,6 +266,37 @@ for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
 sys.argv = filter(None, sys.argv)
 
 
 sys.argv = filter(None, sys.argv)
 
 

+#----------------------------------------------------------------------
+# build options file
+#----------------------------------------------------------------------
+
+build_options_template = """
+UNICODE=%d
+UNDEF_NDEBUG=%d
+INSTALL_MULTIVERSION=%d
+FLAVOUR="%s"
+EP_ADD_OPTS=%d
+WX_CONFIG="%s"
+WXPORT="%s"
+MONOLITHIC=%d
+FINAL=%d
+HYBRID=%d
+""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
+       WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
+
+try: 
+    from build_options import *
+except:
+    build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
+    if not os.path.exists(build_options_file):
+        try:
+            myfile = open(build_options_file, "w")
+            myfile.write(build_options_template)
+            myfile.close()
+        except:
+            print "WARNING: Unable to create build_options.py."
+    
+

 #----------------------------------------------------------------------
 # some helper functions
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # some helper functions
 #----------------------------------------------------------------------


@@ -337,9 +368,14 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
 
         if not cleaning and USE_SWIG:
             for dep in swig_deps:
 
         if not cleaning and USE_SWIG:
             for dep in swig_deps:

-                if newer(dep, py_file) or newer(dep, cpp_file):
-                    force = 1
-                    break
+                # this may fail for external builds, but it's not 
+                # a fatal error, so keep going.
+                try:
+                    if newer(dep, py_file) or newer(dep, cpp_file):
+                        force = 1
+                        break
+                except:
+                    pass

 
             if force or newer(i_file, py_file) or newer(i_file, cpp_file):
                 ## we need forward slashes here even on win32
 
             if force or newer(i_file, py_file) or newer(i_file, cpp_file):
                 ## we need forward slashes here even on win32


@@ -585,8 +621,6 @@ def getExtraPath(shortVer=True, addOpts=False):
 
     return ep
 
 
     return ep
 

-
-

 #----------------------------------------------------------------------
 # sanity checks
 
 #----------------------------------------------------------------------
 # sanity checks
 


@@ -631,7 +665,7 @@ if os.name == 'nt':
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
         WXDIR = '..'  # assumes in CVS tree
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'

-
+           

     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),
     includes = ['include', 'src',
                 opj(WXDIR, 'lib', 'vc_dll', 'msw'  + libFlag()),
                 opj(WXDIR, 'include'),


@@ -800,6 +834,20 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
 # SWIG defaults
 #----------------------------------------------------------------------
 
 # SWIG defaults
 #----------------------------------------------------------------------
 

+# *.i files could live in the wxWidgets/wxPython/src dir, or in 
+# a subdirectory of the devel package. Let's specify both 
+# dirs as includes so we don't have to guess which is correct.
+ 
+wxfilesdir = ""
+i_subdir = opj("include", "wx", "wxPython", "i_files")
+if os.name != "nt":
+    wxfilesdir = opj(WXPREFIX, i_subdir)
+else:
+    wxfilesdir = opj(WXPY_SRC, i_subdir)
+
+i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
+                     '-I' + wxfilesdir ]
+

 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',
 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',


@@ -810,10 +858,9 @@ swig_args = ['-c++',
              '-keyword',
              '-new_repr',
              '-modern',
              '-keyword',
              '-new_repr',
              '-modern',

-
-             '-I' + opj(WXPY_SRC, 'src'),

              '-D'+WXPLAT,
              '-D'+WXPLAT,

-             ]
+             ] + i_files_includes
+             

 if UNICODE:
     swig_args.append('-DwxUSE_UNICODE')
 
 if UNICODE:
     swig_args.append('-DwxUSE_UNICODE')
 


@@ -847,7 +894,6 @@ except ImportError:
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

-

 renamerTemplateStart = """\
 // A bunch of %rename directives generated by BuildRenamers in config.py
 // in order to remove the wx prefix from all global scope names.
 renamerTemplateStart = """\
 // A bunch of %rename directives generated by BuildRenamers in config.py
 // in order to remove the wx prefix from all global scope names.