Completed sync of BASE_CMN_SRC between PalmOS and bakefiles. Missing features (stdpat...

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index bbe0f0eb9d634d0d592474c424f0fd0241dd2212..6a93443a3bf5e80cdda3840a963910498510d60d 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,8 +39,8 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 4
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 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.
+VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "rc1"     # release flags, such as prerelease num, unicode, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"


@@ -834,7 +834,7 @@ 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 
+# *.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.
  
 # a subdirectory of the devel package. Let's specify both 
 # dirs as includes so we don't have to guess which is correct.
  


@@ -844,12 +844,9 @@ if os.name != "nt":
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:
     wxfilesdir = opj(WXPY_SRC, i_subdir)
     wxfilesdir = opj(WXPREFIX, i_subdir)
 else:
     wxfilesdir = opj(WXPY_SRC, i_subdir)

-    
+

 i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
                      '-I' + wxfilesdir ]
 i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
                      '-I' + wxfilesdir ]

-                     
-if wxfilesdir != "":
-    i_files_includes.append(wxfilesdir)

 
 swig_cmd = SWIG
 swig_force = force
 
 swig_cmd = SWIG
 swig_force = force