Skip to content

Commit

Permalink
see ome#2148 - Adding "./build.py -perf" option via ant-contrib
Browse files Browse the repository at this point in the history
git-svn-id: file:///home/svn/omero/trunk@6552 05709c45-44f0-0310-885b-81a1db45b4a6
  • Loading branch information
joshmoore committed Apr 8, 2010
1 parent e096c97 commit 9d2cf07
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions lib/repository/omero.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file modified omero.class
Binary file not shown.

0 comments on commit 9d2cf07

Please sign in to comment.