diff options
author | kennyballou <kballou@onyx.boisestate.edu> | 2013-03-07 18:53:37 -0700 |
---|---|---|
committer | kennyballou <kballou@onyx.boisestate.edu> | 2013-03-07 18:53:37 -0700 |
commit | 9ef292afa91cad6685e29c459ec9c43a5271af6b (patch) | |
tree | 466712453e9037bb0764ad15686380352bb6670b | |
parent | 0539fded91116c2d40ddf08ae888b02fd3a0a482 (diff) | |
parent | 76d0ba3ae1f76900d4f802a7e37ca527a832dfba (diff) | |
download | xnt-9ef292afa91cad6685e29c459ec9c43a5271af6b.tar.gz xnt-9ef292afa91cad6685e29c459ec9c43a5271af6b.tar.xz |
Merge branch 'fix-xntcall' into lint-refactor
Conflicts:
xnt/tasks.py
-rw-r--r-- | xnt/tasks.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xnt/tasks.py b/xnt/tasks.py index f646ce4..fd97891 100644 --- a/xnt/tasks.py +++ b/xnt/tasks.py @@ -120,12 +120,17 @@ def log(msg="", lvl=logging.INFO): """Log message using tasks global logger""" LOGGER.log(lvl, msg) -def call_xnt(target, path): - """Invoke xnt on another build file in a different directory""" +def xntcall(path, targets=None, props=None): + """Invoke xnt on another build file in a different directory + + param: path - to the build file (including build file) + param: targets - list of targets to execute + param: props - dictionary of properties to pass to the build module + """ import xnt.xenant - xnt.xenant.invokeBuild( - xnt.xenant.__loadBuild(path), - target) + from xnt.commands.target import TargetCommand + command = TargetCommand(xnt.xenant.loadBuild(path)) + return command.run(targets=targets, props=None) def call(command, stdout=None, stderr=None): """ Execute the given command, redirecting stdout and stderr |