Further strip version in build.xml

This removes "v." from the start of old-style tags (v.4.3.3) as well as the "g" from the tag name ("-gabc123"). build.py regex updated as well.
melissalinkert · Jan 20, 2012 · c3da7ad · c3da7ad
1 parent d250882
commit c3da7ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.py b/build.py
@@ -131,7 +131,7 @@ def choose_omero_version():
         #
         # See gh-67 for the discussion.
         if not omero_build:
-            omero_version = re.sub("([-]DEV)?-\d+-g[^-]+[+]?",\
+            omero_version = re.sub("([-]DEV)?-\d+-[a-f0-9]+(-dirty)?",\
                     "-DEV", omero_version)
         return [ "-Domero.version=%s%s" % (omero_version, omero_build) ]
     except:

diff --git a/build.xml b/build.xml
@@ -760,7 +760,10 @@ omero.version=${omero.version}
                         <arg line="--dirty"/>
                     </args>
                 </git>
-                <echo>${version.describe}-ice${versions.ice_lib}</echo>
+                <!--"((.*?)-)(v.)+(.*?)-([0-9]+)-g([^-]+)(-dirty)?" select="1\1-2\2-3\3-4\4-5\5"-->
+                <propertyregex property="version.describe.clean" input="${version.describe}"
+                    regexp="^(v.)?(.*?)(-[0-9]+)?((-)g(.*?))?$" select="\2\3\5\6"/>
+                <echo>${version.describe.clean}-ice${versions.ice_lib}</echo>
             </try>
             <catch>
                 <echo>UNKNOWN-ice${versions.ice_lib}</echo>