diff --git a/build.py b/build.py index dc975f27628..593d804bfa8 100755 --- a/build.py +++ b/build.py @@ -127,13 +127,12 @@ def execute(args): 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 + args.pop(0) + A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + args java_omero(A) else: java_omero(args) - notification(""" Finished: %s """ % " ".join(args), 0) + notification(""" Finished: %s """ % " ".join(args), 0) except KeyboardInterrupt: sys.stderr.write("\nCancelled by user\n") sys.exit(2) diff --git a/build.xml b/build.xml index d4c99414a32..b579ef30d97 100644 --- a/build.xml +++ b/build.xml @@ -43,7 +43,10 @@ java component. - + + + + @@ -195,22 +198,14 @@ java component. - - - - - - - - - + - - - - + + + + @@ -544,15 +539,12 @@ java component. - - + + - -omero.version=${omero.version} - @@ -567,16 +559,34 @@ omero.version=${omero.version} - - - - - - - - - - + + + + + + + + + + + + + +omero.version=${omero.version} + + + + + + + + + + + + + + diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml index 19229240b6d..ded2f26048e 100644 --- a/components/antlib/resources/global.xml +++ b/components/antlib/resources/global.xml @@ -143,6 +143,31 @@ + + + + + + + + + + + + + *************************************************************************** + Tests are not compiled. Run "test-compile". Falling back to regular eclipse + *************************************************************************** + + + + + + + + + +