diff options
author | Amar Takhar <amar@rtems.org> | 2016-01-18 00:05:50 -0500 |
---|---|---|
committer | Amar Takhar <verm@darkbeer.org> | 2016-05-02 20:51:24 -0400 |
commit | 3a717592a9d13f7668c7fd3f9638adcc197d873d (patch) | |
tree | 6501d65ad6faba8e19be7f3c8d34f66536a70ec6 /book | |
parent | 46498bd4e36b9f6d6873de3de5acea11d3f546b4 (diff) |
Rework how conf.py is handled.
Needed to switch due to increasing complexity.
Diffstat (limited to 'book')
-rw-r--r-- | book/conf.py | 8 | ||||
-rw-r--r-- | book/wscript | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/book/conf.py b/book/conf.py new file mode 100644 index 0000000..5e042a7 --- /dev/null +++ b/book/conf.py @@ -0,0 +1,8 @@ +import sys, os +sys.path.append(os.path.abspath('../common/')) + +from conf import * + +version = '1.0' +release = '5.0' + diff --git a/book/wscript b/book/wscript index cc7e438..bcd9860 100644 --- a/book/wscript +++ b/book/wscript @@ -2,21 +2,16 @@ from sys import path from os.path import abspath, exists path.append(abspath('../common/')) -from waf import cmd_configure, cmd_build +from waf import cmd_configure_path, cmd_build_path, cmd_options_path def options(ctx): - ctx.add_option('--rtems-path-py', type='string', help="Path to py/ in RTEMS.") + cmd_options_path(ctx) def configure(ctx): - if not ctx.options.rtems_path_py: - ctx.fatal("--rtems-path-py is required") - - ctx.env.RTEMS_PATH = ctx.options.rtems_path_py - cmd_configure(ctx) + cmd_configure_path(ctx) def build(ctx): - dirs = [ "user", "rtemsconfig", @@ -69,4 +64,4 @@ def build(ctx): "CONF_EXTRA": "sys.path.append('%s')" % ctx.env.RTEMS_PATH } - cmd_build(ctx, sub, source_dir="build") + cmd_build_path(ctx) |