Switch to a 3 component+tag versioning scheme instead of the 4 component scheme used by Classic.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

buildtools/config.py

@@ -335,14 +335,13 @@ class Configuration(object):
         # is a release build.  (In theory)
         if os.path.exists('REV.txt'):
             f = open('REV.txt')
-            self.VER_FLAGS = '_' + f.read().strip()
+            self.VER_FLAGS += f.read().strip()
             f.close()
             
-        self.VERSION = "%s.%s.%s.%s%s" % (self.VER_MAJOR, 
-                                          self.VER_MINOR, 
-                                          self.VER_RELEASE,
-                                          self.VER_SUBREL, 
-                                          self.VER_FLAGS)
+        self.VERSION = "%s.%s.%s%s" % (self.VER_MAJOR, 
+                                       self.VER_MINOR, 
+                                       self.VER_RELEASE,
+                                       self.VER_FLAGS)
         
         self.WXDLLVER = '%d%d' % (self.VER_MAJOR, self.VER_MINOR)
         
@@ -755,7 +754,7 @@ def getSvnRev():
         except:
             return None
         if rev != 'exported':
-            svnrev = "r" + rev.split(':')[0]
+            svnrev = rev.split(':')[0]
         return svnrev
     
     def _getGitSvnRevision():
@@ -766,7 +765,7 @@ def getSvnRev():
             return None
         for line in info.splitlines():
             if line.startswith('Revision:'):
-                svnrev = "r" + line.split(' ')[-1]
+                svnrev = line.split(' ')[-1]
                 break
         return svnrev
         

buildtools/version.py

@@ -14,5 +14,30 @@
 VER_MAJOR        = 3      # The first three must match wxWidgets
 VER_MINOR        = 0
 VER_RELEASE      = 1
-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_FLAGS        = ""     # wxPython release flags
+
+# Set the VER_FLAGS component according to the following patterns. These
+# should help us to better conform to the setuptools and/or PEP-0386 notions
+# of version numbers.  
+#
+#   ""             for final release builds
+#
+#   "-1"           for numbered post releases, such as when there are 
+#                  additional wxPython releases for the same wxWidgets 
+#                  release.  TDB: use - or .post or ? 
+#
+#   ".dev12345"    for daily snapshot builds, by default this is automatically
+#                  pulled from the REV.txt file made by the setrev command,
+#                  if it exists, and is appended to VER_FLAGS
+#
+#   "a1"           for official alpha releases
+#   "b1"           for beta relases
+#   "rc1"          for release candidate releases
+#
+#   "-1a1"         For alpha releases of a numbered post release, (betas, etc. 
+#                  of numbered post releases can be done the same way)
+#
+# See also:
+#
+#   http://pythonhosted.org/setuptools/setuptools.html
+#   http://www.python.org/dev/peps/pep-0386/