Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

build: build.py sets omero.shortversion

  • Loading branch information...
commit 0c5c86f4dd95fe10ea45f3d6031ba1cc20c07565 1 parent 7b2e796
@rleigh-dundee rleigh-dundee authored
Showing with 16 additions and 1 deletion.
  1. +16 −1 build.py
View
17 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):
Please sign in to comment.
Something went wrong with that request. Please try again.