Add micro field to the libdiffpy version.

Assume version tag format vMajor.Minor[.Micro].
Convert DIFFPY_VERSION to a floating-point number with
a last version commit age starting at the 4th decimal digit.

Author: pavoljuhas

site_scons/libdiffpybuildutils.py

@@ -25,15 +25,15 @@ def gitinfo():
     vtag = words[0].lstrip('v')
     vnum = int((words[1:2] or ['0'])[0])
     rv['commit'], rv['date'] = glog.strip().split(None, 1)
-    mx = re.match(r'^(\d+)\.(\d+)((?:[ab]|rc)\d*)?', vtag)
+    mx = re.match(r'^(\d+)\.(\d+)(?:\.(\d+))?((?:[ab]|rc)\d*)?', vtag)
     rv['major'] = int(mx.group(1))
     rv['minor'] = int(mx.group(2))
-    rv['prerelease'] = mx.group(3)
+    rv['micro'] = int(mx.group(3) or 0)
+    rv['prerelease'] = mx.group(4)
     rv['number'] = vnum
     rv['version'] = vtag
-    numsep = rv['prerelease'] and '.dev' or '.'
     if vnum:
-        rv['version'] += numsep + str(vnum)
+        rv['version'] += '.post' + str(vnum)
     _cached_gitinfo = rv
     return gitinfo()
 

src/diffpy/SConscript.version

@@ -17,13 +17,18 @@ def parsemajorminor(hcode):
 def build_VersionCode(target, source, env):
     tplcode = source[0].get_contents()
     numversion = (1000000 * ginfo['major'] +
-            1000 * ginfo['minor'] + ginfo['number'])
+            1000 * ginfo['minor'] + ginfo['micro'] +
+            0.0001 * ginfo['number'])
+    libversion = "%.0f" % numversion
+    if ginfo['number']:
+        libversion = "%.4f" % numversion
     if ginfo['prerelease']:
-        numversion = "(-500 + %i)" % numversion
+        libversion = "(-0.5 + %s)" % libversion
     flds = {
-        'DIFFPY_VERSION' : numversion,
+        'DIFFPY_VERSION' : libversion,
         'DIFFPY_VERSION_MAJOR' : ginfo['major'],
         'DIFFPY_VERSION_MINOR' : ginfo['minor'],
+        'DIFFPY_VERSION_MICRO' : ginfo['micro'],
         'DIFFPY_VERSION_STR' : ginfo['version'],
         'DIFFPY_VERSION_DATE' : ginfo['date'],
         'DIFFPY_GIT_SHA' : ginfo['commit'],

src/diffpy/version.cpp

@@ -18,10 +18,11 @@
 
 #include <diffpy/version.hpp>
 
-const int libdiffpy_version_info::version = DIFFPY_VERSION;
+const double libdiffpy_version_info::version = DIFFPY_VERSION;
 const char* libdiffpy_version_info::version_str = DIFFPY_VERSION_STR;
 const int libdiffpy_version_info::major = DIFFPY_VERSION_MAJOR;
 const int libdiffpy_version_info::minor = DIFFPY_VERSION_MINOR;
+const int libdiffpy_version_info::micro = DIFFPY_VERSION_MICRO;
 const char* libdiffpy_version_info::date = DIFFPY_VERSION_DATE;
 const char* libdiffpy_version_info::git_sha = DIFFPY_GIT_SHA;
 

src/diffpy/version.tpl

@@ -16,6 +16,7 @@
 *   DIFFPY_VERSION,
 *   DIFFPY_VERSION_MAJOR,
 *   DIFFPY_VERSION_MINOR,
+*   DIFFPY_VERSION_MICRO,
 *   DIFFPY_VERSION_STR,
 *   DIFFPY_VERSION_DATE
 *   DIFFPY_GIT_SHA
@@ -25,15 +26,22 @@
 *
 *****************************************************************************/
 
-#ifndef VERSION_HPP_INCLUDED
-#define VERSION_HPP_INCLUDED
+#ifndef LIBDIFFPY_VERSION_HPP_INCLUDED
+#define LIBDIFFPY_VERSION_HPP_INCLUDED
 
 #define DIFFPY_VERSION_MAJOR ${DIFFPY_VERSION_MAJOR}
 #define DIFFPY_VERSION_MINOR ${DIFFPY_VERSION_MINOR}
-
-// DIFFPY_VERSION % 1000 is number of git commits since minor version
-// DIFFPY_VERSION / 1000 % 1000 is the minor version
-// DIFFPY_VERSION / 1000000 is the major version
+#define DIFFPY_VERSION_MICRO ${DIFFPY_VERSION_MICRO}
+
+// round(DIFFPY_VERSION) / 1000000 is the major version
+// round(DIFFPY_VERSION) / 1000 % 1000 is the minor version
+// round(DIFFPY_VERSION) % 1000 is the micro version
+// round(DIFFPY_VERSION * 10000) % 1000
+//      is number of git commits since the last tag
+//
+// alpha and beta releases have smaller DIFFPY_VERSION than
+// a completed release.  Numerical comparison of DIFFPY_VERSION
+// values from two pre-releases may be inaccurate.
 
 #define DIFFPY_VERSION ${DIFFPY_VERSION}
 
@@ -54,15 +62,16 @@
 
 struct libdiffpy_version_info {
 
-    static const int version;
+    static const double version;
     static const char* version_str;
     static const int major;
     static const int minor;
+    static const int micro;
     static const char* date;
     static const char* git_sha;
 
 };
 
-#endif  // VERSION_HPP_INCLUDED
+#endif  // LIBDIFFPY_VERSION_HPP_INCLUDED
 
 // vim:ft=cpp: