From: Robin Dunn Date: Fri, 19 Dec 2003 04:42:39 +0000 (+0000) Subject: Version number X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b0640a71ca6594cc89a7b2fe96214a0282823ea3 Version number git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/setup.py b/wxPython/setup.py index ba32bc46af..2f945984d7 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #---------------------------------------------------------------------- -import sys, os, glob, fnmatch +import sys, os, glob, fnmatch, tempfile from distutils.core import setup, Extension from distutils.file_util import copy_file from distutils.dir_util import mkpath @@ -17,7 +17,7 @@ VER_MAJOR = 2 # The first three must match wxWindows VER_MINOR = 5 VER_RELEASE = 1 VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows -VER_FLAGS = "p4" # release flags, such as prerelease num, unicode, etc. +VER_FLAGS = "p5" # release flags, such as prerelease num, unicode, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" @@ -272,30 +272,28 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps= #i_file = opj(i_file) #'/'.join(i_file.split('\\')) if BUILD_RENAMERS: - #info_file = "./distrib/swig_info" - #info_dict = { 'cmd' : swig_cmd, - # 'args' : swig_args + ['-I'+dir] - # } - #open(info_file, "w").write(str(args_dict)) - + #tempfile.tempdir = sourcePath + xmltemp = tempfile.mktemp('.xml') + # First run swig to produce the XML file, adding # an extra -D that prevents the old rename # directives from being used cmd = [ swig_cmd ] + swig_args + \ - [ '-DBUILDING_RENAMERS', '-xmlout', xml_file ] + \ + [ '-DBUILDING_RENAMERS', '-xmlout', xmltemp ] + \ ['-I'+dir, '-o', cpp_file, i_file] msg(' '.join(cmd)) spawn(cmd) # Next run build_renamers to process the XML cmd = [ sys.executable, '-u', - './distrib/build_renamers.py', dir, basefile, xml_file] + './distrib/build_renamers.py', dir, basefile, xmltemp] msg(' '.join(cmd)) spawn(cmd) - #os.remove(info_file) + os.remove(xmltemp) # Then run swig for real - cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file, i_file] + cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file, + '-xmlout', xml_file, i_file] msg(' '.join(cmd)) spawn(cmd) diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index 7253937246..5049f9b547 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1,12 +1,12 @@ # This file was generated by setup.py... -VERSION_STRING = '2.5.1.0p4' +VERSION_STRING = '2.5.1.0p5' MAJOR_VERSION = 2 MINOR_VERSION = 5 RELEASE_VERSION = 1 SUBREL_VERSION = 0 VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION, - SUBREL_VERSION, 'p4') + SUBREL_VERSION, 'p5') RELEASE_NUMBER = RELEASE_VERSION # for compatibility