From 3a717592a9d13f7668c7fd3f9638adcc197d873d Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Mon, 18 Jan 2016 00:05:50 -0500 Subject: Rework how conf.py is handled. Needed to switch due to increasing complexity. --- rtemsconfig/wscript | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'rtemsconfig/wscript') diff --git a/rtemsconfig/wscript b/rtemsconfig/wscript index a681104..7d9e282 100644 --- a/rtemsconfig/wscript +++ b/rtemsconfig/wscript @@ -2,32 +2,15 @@ from sys import path from os.path import abspath path.append(abspath('../common/')) +from waf import cmd_options_path, cmd_configure_path, cmd_build_path -from waf import cmd_configure, cmd_build 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): -# path.append(ctx.env.RTEMS_PATH) - - sub = { - "VERSION": "1.0", - "RELEASE": "5.0.0", - "DOC": "RTEMS Config", - "FILE_DOC": "rtemsconfig", - "CONF_EXTRA": "sys.path.append('%s')" % ctx.env.RTEMS_PATH - } + cmd_build_path(ctx) - cmd_build(ctx, sub) -- cgit v1.2.3