From 699aa7a637d6168e79f14f6a12fd31b9176d6d40 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 10 Jan 2012 09:57:03 +0100 Subject: [PATCH] Add ice version to omero.version for non-OMERO_BUILDs too Now any build run via ./build.py (or build.bat) will have the current ice version appended to the omero.version value (e.g. 4.3.3-ice34) --- build.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/build.py b/build.py index db7ed527937..9a454a186ea 100755 --- a/build.py +++ b/build.py @@ -94,19 +94,21 @@ def choose_omero_version(): If OMERO_BULID is set, then "-Domero.version=${omero-version}-${OMERO_BUILD}" otherwise nothing. """ + + omero_build = os.environ.get("OMERO_BUILD", "") + if omero_build: + omero_build = "-%s" % omero_build + + command = [ find_java(), "omero","-q","version" ] try: - omero_build = os.environ["OMERO_BUILD"] - command = [ find_java(), "omero","-q","version" ] - try: - p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - omero_version,err = p.communicate() - omero_version = omero_version.split()[1] - return [ "-Domero.version=%s-%s" % (omero_version, omero_build) ] - except: - print "Error getting version for OMERO_BUILD=%s" % omero_build - print err - except KeyError, ke: - return [] # Use default + p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + omero_version,err = p.communicate() + omero_version = omero_version.split()[1] + return [ "-Domero.version=%s%s" % (omero_version, omero_build) ] + except: + print "Error getting version for OMERO_BUILD=%s" % omero_build + print err + sys.exit(rc) def execute(args): rc = subprocess.call(args)