diff --git a/build.py b/build.py index b6ecd315376..e6e75b7de3c 100755 --- a/build.py +++ b/build.py @@ -1,111 +1,110 @@ -#!/usr/bin/env python -# -# $Id$ -# -# Copyright 2009 Glencoe Software, Inc. All rights reserved. -# Use is subject to license terms supplied in LICENSE.txt -# -# General build scripts. - -import os -import sys -import subprocess - -def build_hudson(): - """ - Top-level build called by hudson for testing the - """ - # - # Cleaning to prevent strange hudson errors about - # stale tests and general weirdness. - # - java_omero("clean") - - # Build & Test - java_omero("build-all") - java_omero("test-integration") - java_omero("test-dist") - - # - # Documentation and build reports - # - java_omero("release-docs") - java_omero("release-findbugs") - ## java_omero("release-jdepend") ## Doesn't yet work. Running from hudson - - # - # Prepare a distribution - # - "rm -f OMERO.server-build*.zip" - java_omero(["-f","components/tools/OmeroImporter/build.xml","release-win-zip"]) - java_omero(["-f","components/tools/OmeroImporter/build.xml","release-osx-zip"]) - java_omero("release-zip") - - # Install into the hudson repository - ## Disabling until 4.1 with more work - ## on integration - ##java_omero("release-hudson") - - -def java_omero(args): - command = [ find_java() ] - command.extend( calculate_memory_args() ) - command.extend(["omero"]) - command.extend(choose_omero_version()) - if isinstance(args,str): - command.append(args) - else: - command.extend(args) - execute(command) - -def find_java(): - return "java" - -def calculate_memory_args(): - return "-Xmx600M -Djavac.maxmem=600M -Djavadoc.maxmem=600M -XX:MaxPermSize=256m".split(" ") - -def choose_omero_version(): - """ - Returns an array specifying the build parameter for - ant. Returned as an array so that an empty value can - be extended into the build command. - - If OMERO_BULID is set, then "-Domero.version=${omero-version}-${OMERO_BUILD}" - otherwise nothing. - """ - try: - omero_build = os.environ["OMERO_BUILD"] - command = [ find_java() ] - command.extend( calculate_memory_args() ) - command.extend(["omero","-q","version"]) - 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 KeyError, ke: - return [] # Use default - -def execute(args): - rc = subprocess.call(args) - if rc != 0: - sys.exit(rc) - - - -if __name__ == "__main__": - # - # If this is a hudson build, then call the special build_hudson - # method. Otherwise, use java_omero which will specially configure - # the build system. - # - args = list(sys.argv) - args.pop(0) - - try: - if len(args) > 0 and args[0] == "-hudson": - build_hudson() - else: - java_omero(args) - except KeyboardInterrupt: - sys.stderr.write("\nCancelled by user\n") - sys.exit(2) +#!/usr/bin/env python +# +# $Id$ +# +# Copyright 2009 Glencoe Software, Inc. All rights reserved. +# Use is subject to license terms supplied in LICENSE.txt +# +# General build scripts. + +import os +import sys +import subprocess + +def build_hudson(): + """ + Top-level build called by hudson for testing the + """ + # + # Cleaning to prevent strange hudson errors about + # stale tests and general weirdness. + # + java_omero("clean") + + # Build & Test + java_omero("build-all") + java_omero("test-integration") + java_omero("test-dist") + + # + # Documentation and build reports + # + java_omero("release-docs") + java_omero("release-findbugs") + ## java_omero("release-jdepend") ## Doesn't yet work. Running from hudson + + # + # Prepare a distribution + # + "rm -f OMERO.server-build*.zip" + java_omero(["-f","components/tools/OmeroImporter/build.xml","release-win-zip"]) + java_omero(["-f","components/tools/OmeroImporter/build.xml","release-osx-zip"]) + java_omero("release-zip") + + # Install into the hudson repository + ## Disabling until 4.1 with more work + ## on integration + ##java_omero("release-hudson") + + +def java_omero(args): + command = [ find_java() ] + command.extend( calculate_memory_args() ) + command.extend(["omero"]) + command.extend(choose_omero_version()) + if isinstance(args,str): + command.append(args) + else: + command.extend(args) + execute(command) + +def find_java(): + return "java" + +def calculate_memory_args(): + return "-Xmx600M -Djavac.maxmem=600M -Djavadoc.maxmem=600M -XX:MaxPermSize=256m".split(" ") + +def choose_omero_version(): + """ + Returns an array specifying the build parameter for + ant. Returned as an array so that an empty value can + be extended into the build command. + + If OMERO_BULID is set, then "-Domero.version=${omero-version}-${OMERO_BUILD}" + otherwise nothing. + """ + try: + omero_build = os.environ["OMERO_BUILD"] + command = [ find_java() ] + command.extend( calculate_memory_args() ) + command.extend(["omero","-q","version"]) + 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 KeyError, ke: + return [] # Use default + +def execute(args): + rc = subprocess.call(args) + if rc != 0: + sys.exit(rc) + + +if __name__ == "__main__": + # + # If this is a hudson build, then call the special build_hudson + # method. Otherwise, use java_omero which will specially configure + # the build system. + # + args = list(sys.argv) + args.pop(0) + + try: + if len(args) > 0 and args[0] == "-hudson": + build_hudson() + else: + java_omero(args) + except KeyboardInterrupt: + sys.stderr.write("\nCancelled by user\n") + sys.exit(2) diff --git a/components/blitz/build.xml b/components/blitz/build.xml index 95c099d7837..fed17b50ab0 100644 --- a/components/blitz/build.xml +++ b/components/blitz/build.xml @@ -1,221 +1,219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/tools/OmeroPy/build.xml b/components/tools/OmeroPy/build.xml index 99d9efd82f2..f51088603ff 100644 --- a/components/tools/OmeroPy/build.xml +++ b/components/tools/OmeroPy/build.xml @@ -40,9 +40,9 @@ + - diff --git a/components/tools/python.xml b/components/tools/python.xml index d363f42bca7..8b080c2a57f 100644 --- a/components/tools/python.xml +++ b/components/tools/python.xml @@ -1,97 +1,97 @@ - - - - Entering ${basedir}... - - - - - - - omero_version="${omero.version}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Not yet implemented - - - + + + + Entering ${basedir}... + + + + + + + omero_version="${omero.version}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Not yet implemented + + +