diff --git a/build.py b/build.py
index 6e769c87411..a4db0746ccc 100755
--- a/build.py
+++ b/build.py
@@ -119,12 +119,24 @@ def choose_omero_version():
del os.environ['CLASSPATH']
try:
- if len(args) > 0 and args[0] == "-perf":
- args.pop(0)
- A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + args
- java_omero(A)
- else:
- java_omero(args)
+ additions = []
+ while len(args) > 0 and args[0] in ("-perf", "-py", "-cpp"):
+ if args[0] == "-perf":
+ args.pop(0)
+ A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split()
+ additions.extend(A)
+ elif args[0] == "-py":
+ args.pop(0)
+ F = os.path.sep.join(["components","tools","OmeroPy","build.xml"])
+ A = ["-f", F]
+ additions.extend(A)
+ elif args[0] == "-cpp":
+ args.pop(0)
+ F = os.path.sep.join(["components","tools","OmeroCpp","build.xml"])
+ A = ["-f", F]
+ additions.extend(A)
+ args = additions + args
+ java_omero(args)
notification(""" Finished: %s """ % " ".join(args), 0)
except KeyboardInterrupt:
sys.stderr.write("\nCancelled by user\n")
diff --git a/build.xml b/build.xml
index f37907b00d5..7cd1f685750 100644
--- a/build.xml
+++ b/build.xml
@@ -914,6 +914,74 @@ omero.version=${omero.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index 58712b875fc..7c80371dcd1 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -60,6 +60,7 @@
+