diff --git a/build.py b/build.py index 3b2f61ed496..dc975f27628 100755 --- a/build.py +++ b/build.py @@ -126,6 +126,11 @@ def execute(args): try: if len(args) > 0 and args[0] == "-hudson": build_hudson() + elif len(args) > 0 and args[0] == "-perf": + A = list(args) + A.pop(0) + A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + A + java_omero(A) else: java_omero(args) notification(""" Finished: %s """ % " ".join(args), 0) diff --git a/lib/repository/omero.java b/lib/repository/omero.java index 45757dd227e..6736407af31 100644 --- a/lib/repository/omero.java +++ b/lib/repository/omero.java @@ -190,13 +190,14 @@ private boolean isJDKToolsAvailable() private File[] locateBuildJars() throws Exception { - File[] jars = new File[6]; + File[] jars = new File[7]; jars[0] = new File("lib/repository/junit-3.8.1.jar"); jars[1] = new File("lib/repository/ant-1.8.0.jar"); jars[2] = new File("lib/repository/ant-launcher-1.8.0.jar"); jars[3] = new File("lib/repository/ant-junit-1.8.0.jar"); jars[4] = new File("lib/repository/ant-nodeps-1.8.0.jar"); - jars[5] = new File("lib/repository/bsh-2.0b4.jar"); + jars[5] = new File("lib/repository/ant-contrib-1.0b3.jar"); + jars[6] = new File("lib/repository/bsh-2.0b4.jar"); if (!isJDKToolsAvailable()) { //Try and grab tools.jar. if (jdkTools.exists()) { //Add it to the other jars. diff --git a/omero.class b/omero.class index 0720d8e8d06..6893b97bf76 100644 Binary files a/omero.class and b/omero.class differ