From 4697089a82809bd67d767c62bacdec5f1e0ef3b8 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 27 Mar 2018 00:16:30 -0700 Subject: [PATCH] build: move Linux configuration options to its own sections --- Tools/ardupilotwaf/ardupilotwaf.py | 1 + wscript | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py index b7894a4395..0f5297496f 100644 --- a/Tools/ardupilotwaf/ardupilotwaf.py +++ b/Tools/ardupilotwaf/ardupilotwaf.py @@ -383,6 +383,7 @@ def _select_programs_from_group(bld): def options(opt): opt.ap_groups = { 'configure': opt.add_option_group('Ardupilot configure options'), + 'linux': opt.add_option_group('Linux boards configure options'), 'build': opt.add_option_group('Ardupilot build options'), 'check': opt.add_option_group('Ardupilot check options'), 'clean': opt.add_option_group('Ardupilot clean options'), diff --git a/wscript b/wscript index aa89e8273b..0f28702e8e 100644 --- a/wscript +++ b/wscript @@ -82,6 +82,16 @@ Don't update git submodules. Useful for building with submodules at specific revisions. ''') + g.add_option('--disable-header-checks', action='store_true', + default=False, + help="Disable checking of headers") + + g.add_option('--default-parameters', + default=None, + help='set default parameters to embed in the firmware') + + g = opt.ap_groups['linux'] + g.add_option('--rsync-dest', dest='rsync_dest', action='store', @@ -108,19 +118,11 @@ order to save typing. default=False, help="Disable compilation and test execution") - g.add_option('--disable-header-checks', action='store_true', - default=False, - help="Disable checking of headers") - g.add_option('--static', action='store_true', default=False, help='Force a static build') - g.add_option('--default-parameters', - default=None, - help='set default parameters to embed in the firmware') - def _collect_autoconfig_files(cfg): for m in sys.modules.values(): paths = []