From 04ab4ed4b9c4bca4357d1c43c75b30da807fe1c0 Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Mon, 3 Feb 2014 15:01:28 +0000
Subject: [PATCH] build: build.py sets omero.shortversion

---
 build.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/build.py b/build.py
index 7a0407cb842..0c1ba9caf43 100755
--- a/build.py
+++ b/build.py
@@ -121,9 +121,24 @@ def choose_omero_version():
             print err
         sys.exit(1)
 
+    command = [ find_java(), "omero",BUILD_PY,"-q","shortversion" ]
+    err = ""
+    try:
+        p = popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        omero_short_version, err = p.communicate()
+        omero_short_version = omero_short_version.split()[1]
+        if not omero_build:
+            omero_short_version = re.sub("([-]DEV)?-\d+-[a-f0-9]+(-dirty)?",\
+                    "-DEV", omero_short_version)
+    except:
+        print "Error getting short version for BUILD_NUMBER=%s" % omero_build
+        if err:
+            print err
+        sys.exit(1)
 
     return [ "-Domero.version=%s%s" % (omero_version, omero_build),
-             "-Domero.plainversion=%s%s" % (omero_plain_version, omero_build) ]
+             "-Domero.plainversion=%s" % (omero_plain_version),
+             "-Domero.shortversion=%s" % (omero_short_version) ]
 
 
 def handle_tools(args):