Patch from Will Sadkin:

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index ee8414f47633be7179a69ed1d9f1cdfa19537917..24bdf07ad729ba471b0e5a53a6f3b4e57f3330d9 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,8 +37,8 @@ import distutils.command.clean
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
-VER_RELEASE      = 1
-VER_SUBREL       = 6      # wxPython release num for x.y.z release of wxWidgets
+VER_RELEASE      = 2
+VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWidgets
 VER_FLAGS        = "p"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
@@ -300,7 +300,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
         i_file   = os.path.join(dir, file)
         py_file  = os.path.join(dir, gendir, pre+basefile+'.py')
         cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')
-        xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml')
+        xml_file = os.path.join("docs", "xml-raw", basefile+pre+'_swig.xml')
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']
@@ -720,6 +720,9 @@ if UNICODE:
     BUILD_BASE = BUILD_BASE + '.unicode'
     VER_FLAGS += 'u'
 
+if os.path.exists('DAILY_BUILD'):
+    
+    VER_FLAGS += '.' + open('DAILY_BUILD').read().strip()
 
 VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
                              VER_SUBREL, VER_FLAGS)