summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorkennyballou <kballou@onyx.boisestate.edu>2013-03-10 20:52:26 -0600
committerkennyballou <kballou@onyx.boisestate.edu>2013-03-10 20:52:26 -0600
commit4edf99b3064e9eb29e8d48e6f4954a71a8a98425 (patch)
treecd76cc668852de642233e53ab8c883d56316c7ab /docs
parentdc48af934f5f5db12faddf9fd9419635d1e80368 (diff)
parentbef742210b3f620b6e805a77a5320b79ab78b985 (diff)
downloadxnt-4edf99b3064e9eb29e8d48e6f4954a71a8a98425.tar.gz
xnt-4edf99b3064e9eb29e8d48e6f4954a71a8a98425.tar.xz
Merge branch build spec feature -> parsing rewrite
Conflicts: docs/source/xenant.rst
Diffstat (limited to 'docs')
-rw-r--r--docs/source/taskreference.rst5
-rw-r--r--docs/source/xenant.rst3
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/source/taskreference.rst b/docs/source/taskreference.rst
index a65f00e..3a36d21 100644
--- a/docs/source/taskreference.rst
+++ b/docs/source/taskreference.rst
@@ -89,15 +89,14 @@ Miscellaneous Tasks
change; I'm not sure how I feel about that yet.]
.. _xnt.tasks.xntcall:
-.. function:: xntcall(path, targets=None, props=None)
+.. function:: xntcall(buildfile, targets=None, props=None)
Invoke the *target(s)* of a build file in a different *path*.
*target* is the name of the target to invoke (similar to *target* of a
regular invocation.
- *path* is the relative or full path to where the "sub" *build.py* file can
- be found.
+ *buildfile* is the path (relative or full) and build file to use
Compile Tasks
=============
diff --git a/docs/source/xenant.rst b/docs/source/xenant.rst
index 156883f..f5907bb 100644
--- a/docs/source/xenant.rst
+++ b/docs/source/xenant.rst
@@ -84,6 +84,9 @@ Where options can be any and all of the following (unless otherwise specified):
* ``-v`` or ``--verbose``: add verbose output to the execution of Xnt
+* ``-b BUILDFILE`` or ``--build-file BUILDFILE``: specifiy to Xnt the build
+ module to load
+
.. _xntPropertiesParameters:
Properties and Parameter Passing