From a98c42fef9112e339af6422c451be0e008065219 Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Mon, 22 Aug 2016 16:33:18 -0300 Subject: [PATCH] waf: define ap_groups in ardupilotwaf tool That makes more sense, since that module is supposed to have basic Ardupilot specific features. The root wscript should be a mere user of those features. --- Tools/ardupilotwaf/ardupilotwaf.py | 6 ++++++ wscript | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py index 115528a1ec..69243c3d3d 100644 --- a/Tools/ardupilotwaf/ardupilotwaf.py +++ b/Tools/ardupilotwaf/ardupilotwaf.py @@ -346,6 +346,12 @@ def _select_programs_from_group(bld): bld.targets += ',' + tg.name def options(opt): + opt.ap_groups = { + 'configure': opt.add_option_group('Ardupilot configure options'), + 'build': opt.add_option_group('Ardupilot build options'), + 'check': opt.add_option_group('Ardupilot check options'), + } + g = opt.ap_groups['build'] g.add_option('--program-group', diff --git a/wscript b/wscript index 4b03869886..6e8f1671a0 100644 --- a/wscript +++ b/wscript @@ -47,13 +47,6 @@ def init(ctx): def options(opt): opt.load('compiler_cxx compiler_c waf_unit_test python') - - opt.ap_groups = { - 'configure': opt.add_option_group('Ardupilot configure options'), - 'build': opt.add_option_group('Ardupilot build options'), - 'check': opt.add_option_group('Ardupilot check options'), - } - opt.load('ardupilotwaf') opt.load('build_summary')