X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72fdc4585e28cb7ad84d6bc48292b4bd233d5846..6caa0f5cd18fe9fb39c207d5f31fa5633479a822:/wxPython/config.py diff --git a/wxPython/config.py b/wxPython/config.py index 15349bf3f3..334dda3009 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -38,9 +38,9 @@ import distutils.command.clean VER_MAJOR = 2 # The first three must match wxWidgets VER_MINOR = 8 -VER_RELEASE = 0 -VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets -VER_FLAGS = "" # release flags, such as prerelease or RC num, etc. +VER_RELEASE = 1 +VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets +VER_FLAGS = "" # release flags, such as prerelease or RC num, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" @@ -105,7 +105,7 @@ FULL_DOCS = 0 # Some docstrings are split into a basic docstring and a # cause the two strings to be combined and output # as the full docstring. -UNICODE = 0 # This will pass the 'wxUSE_UNICODE' flag to SWIG and +UNICODE = 1 # This will pass the 'wxUSE_UNICODE' flag to SWIG and # will ensure that the right headers are found and the # right libs are linked. @@ -612,11 +612,13 @@ def getExtraPath(shortVer=True, addOpts=False): if shortVer: # short version, just Major.Minor ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR) - + # plus release if minor is odd if VER_MINOR % 2 == 1: ep += ".%d" % VER_RELEASE + ##ep = "wx-%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE) + else: # long version, full version ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL) @@ -869,11 +871,9 @@ except: if UNICODE: BUILD_BASE = BUILD_BASE + '.unicode' - ##VER_FLAGS += 'u' if os.path.exists('DAILY_BUILD'): - - VER_FLAGS += '-' + open('DAILY_BUILD').read().strip() + VER_FLAGS += '.' + open('DAILY_BUILD').read().strip() VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL, VER_FLAGS)