Include the svn revision in the version numbers.

Various other sdist and bdist tweaks and updates.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2013-03-30 04:42:00 +00:00
parent 4de619c4d5
commit 6b4601273a
6 changed files with 78 additions and 55 deletions

View File

@@ -94,16 +94,24 @@ class Configuration(object):
# load the version numbers into this instance's namespace
versionfile = opj(os.path.split(__file__)[0], 'version.py')
myExecfile(versionfile, self.__dict__)
# If we're doing a dated build then alter the VERSION strings
if os.path.exists('DAILY_BUILD'):
self.VER_FLAGS += '.b' + open('DAILY_BUILD').read().strip()
# Include the subversion revision in the version number?
if os.environ.get('WXRELEASE') is None:
# TODO: It would be nice to have a better fallback than the date
# if this is not being run in a svn or git-svn environment...
# Perhaps writing the last used valid revision number to a file?
# Or perhaps pull it from the PKG-INFO file in egg-info?
#
# TODO #2: an environment variable is not a good way to control
# this...
self.VER_FLAGS = '-' + getSvnRev()
self.VERSION = "%s.%s.%s.%s%s" % (self.VER_MAJOR,
self.VER_MINOR,
self.VER_RELEASE,
self.VER_SUBREL,
self.VER_FLAGS)
self.WXDLLVER = '%d%d' % (self.VER_MAJOR, self.VER_MINOR)
# change the PORT default for wxMac

View File

@@ -14,5 +14,5 @@
VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 9
VER_RELEASE = 5
VER_SUBREL = 80 # wxPython release num for x.y.z release of wxWidgets
VER_SUBREL = 81 # wxPython release num for x.y.z release of wxWidgets
VER_FLAGS = "" # release flags, such as prerelease or RC num, etc.