Skip to content

Commit

Permalink
./build.py -top now ignores local build.xml files
Browse files Browse the repository at this point in the history
Previous minor fixes to build.py allowed called from
anywhere in the source repository. If a build.xml is
present in the current directory, that is used. If not,
then the top-level directory is used. However, there
was no way to use the top-level when a build.xml was
present. `-top` now allows this.
  • Loading branch information
joshmoore committed Jan 17, 2013
1 parent 38e6a35 commit 2e0d431
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def choose_omero_version():

def handle_tools(args):
additions = []
while len(args) > 0 and args[0] in ("-perf", "-py", "-cpp"):
while len(args) > 0 and args[0] in ("-perf", "-py", "-cpp", "-top"):
if args[0] == "-perf":
args.pop(0)
A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split()
Expand All @@ -124,6 +124,11 @@ def handle_tools(args):
F = os.path.sep.join(["components","tools","OmeroCpp","build.xml"])
A = ["-f", F]
additions.extend(A)
elif args[0] == "-top":
args.pop(0)
F = os.path.sep.join(["build.xml"])
A = ["-f", F]
additions.extend(A)
return additions + args


Expand Down

0 comments on commit 2e0d431

Please sign in to comment.