From 67acc03e35ddd03b38c7b98fc078fdd2c360866a Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Tue, 5 Nov 2013 13:54:05 +0000
Subject: [PATCH] build: Add plainversion

---
 build.py  | 20 +++++++++++++++++++-
 build.xml | 28 +++++++++++++++++-----------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/build.py b/build.py
index 5e2c1bbc893..7a0407cb842 100755
--- a/build.py
+++ b/build.py
@@ -100,13 +100,31 @@ def choose_omero_version():
         if not omero_build:
             omero_version = re.sub("([-]DEV)?-\d+-[a-f0-9]+(-dirty)?",\
                     "-DEV", omero_version)
-        return [ "-Domero.version=%s%s" % (omero_version, omero_build) ]
     except:
         print "Error getting version for BUILD_NUMBER=%s" % omero_build
         if err:
             print err
         sys.exit(1)
 
+    command = [ find_java(), "omero",BUILD_PY,"-q","plainversion" ]
+    err = ""
+    try:
+        p = popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        omero_plain_version, err = p.communicate()
+        omero_plain_version = omero_plain_version.split()[1]
+        if not omero_build:
+            omero_plain_version = re.sub("([-]DEV)?-\d+-[a-f0-9]+(-dirty)?",\
+                    "-DEV", omero_plain_version)
+    except:
+        print "Error getting plain 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) ]
+
 
 def handle_tools(args):
     _ = os.path.sep.join
diff --git a/build.xml b/build.xml
index a5cb4d3b957..5ad74a28b6e 100644
--- a/build.xml
+++ b/build.xml
@@ -438,40 +438,40 @@ To get started using Eclipse, execute "./build.py build-dev" and import the top-
         </zip>
     </target>
 
-    <target name="release-src" description="Package the git source tree into openmicroscopy-${omero.version}.zip">
+    <target name="release-src" description="Package the git source tree into openmicroscopy-${omero.plainversion}.zip">
         <delete includeemptydirs="true">
-          <fileset dir="${target.dir}" includes="openmicroscopy-${omero.version}*.zip"/>
+          <fileset dir="${target.dir}" includes="openmicroscopy-${omero.plainversion}*.zip"/>
         </delete>
-        <delete dir="${target.dir}/openmicroscopy-${omero.version}" quiet="true"/>
+        <delete dir="${target.dir}/openmicroscopy-${omero.plainversion}" quiet="true"/>
         <git command="archive" output="release-src-command" failonerror="true">
             <args>
-                <arg value="--prefix=openmicroscopy-${omero.version}/"/>
+                <arg value="--prefix=openmicroscopy-${omero.plainversion}/"/>
                 <arg value="--format=zip"/>
                 <arg value="HEAD"/>
                 <arg value="-o"/>
-                <arg value="${target.dir}/openmicroscopy-${omero.version}.zip"/>
+                <arg value="${target.dir}/openmicroscopy-${omero.plainversion}.zip"/>
             </args>
         </git>
         <git command="submodule" output="release-src-submods" failonerror="true">
             <args>
                 <arg value="foreach"/>
                 <arg value="--recursive"/>
-                <arg value="zip=${target.dir}/openmicroscopy-${omero.version}-$(echo &quot;${path}.zip&quot; | sed -e &quot;s;/;_;g&quot;) ; git archive --prefix=openmicroscopy-${omero.version}/${path}/ --format=zip HEAD -o &quot;${zip}&quot;"/>
+                <arg value="zip=${target.dir}/openmicroscopy-${omero.plainversion}-$(echo &quot;${path}.zip&quot; | sed -e &quot;s;/;_;g&quot;) ; git archive --prefix=openmicroscopy-${omero.plainversion}/${path}/ --format=zip HEAD -o &quot;${zip}&quot;"/>
             </args>
         </git>
         <unzip dest="${target.dir}">
           <fileset dir="${target.dir}">
-            <include name="openmicroscopy-${omero.version}*.zip"/>
+            <include name="openmicroscopy-${omero.plainversion}*.zip"/>
           </fileset>
         </unzip>
         <delete includeemptydirs="true">
-          <fileset dir="${target.dir}" includes="openmicroscopy-${omero.version}*.zip"/>
+          <fileset dir="${target.dir}" includes="openmicroscopy-${omero.plainversion}*.zip"/>
         </delete>
-        <zip destfile="${target.dir}/openmicroscopy-${omero.version}.zip"
+        <zip destfile="${target.dir}/openmicroscopy-${omero.plainversion}.zip"
              basedir="${target.dir}"
-             includes="openmicroscopy-${omero.version}/**"
+             includes="openmicroscopy-${omero.plainversion}/**"
              />
-        <delete dir="${target.dir}/openmicroscopy-${omero.version}" quiet="true"/>
+        <delete dir="${target.dir}/openmicroscopy-${omero.plainversion}" quiet="true"/>
     </target>
 
     <target name="release-clients" description="Zip the Python, Java, and Matlab zips">
@@ -1070,6 +1070,12 @@ omero.version=${omero.version}
         <echo>${version.describe}-ice${versions.ice_lib}</echo>
     </target>
 
+    <target name="plainversion">
+        <gitdescribe select="\2\3\5\6">
+        </gitdescribe>
+        <echo>${version.describe}</echo>
+    </target>
+
     <target name="print-mem">
         <echo>
             *.maxmem.* settings