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.
This commit is contained in:
Gustavo Jose de Sousa 2016-08-22 16:33:18 -03:00 committed by Lucas De Marchi
parent a6ec802d28
commit a98c42fef9
2 changed files with 6 additions and 7 deletions

View File

@ -346,6 +346,12 @@ def _select_programs_from_group(bld):
bld.targets += ',' + tg.name bld.targets += ',' + tg.name
def options(opt): 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 = opt.ap_groups['build']
g.add_option('--program-group', g.add_option('--program-group',

View File

@ -47,13 +47,6 @@ def init(ctx):
def options(opt): def options(opt):
opt.load('compiler_cxx compiler_c waf_unit_test python') 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('ardupilotwaf')
opt.load('build_summary') opt.load('build_summary')