From c4c9ce6a2ad24bbe2dc971028382d5d6959b085f Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Mon, 7 Dec 2015 14:55:32 -0200 Subject: [PATCH] waf: ardupilotwaf: use name without board extention If the attribute name is passed, then it is the one used to process the option --target[s] of waf build. The board name should be used only in configuration time. The build targets should be board/platform agnostic. Now, instead of using `waf --target ArduCopter.sitl`, we use `waf --target ArduCopter` and the binary continues named as "ArduCopter.sitl". --- README_waf.txt | 4 ++-- Tools/ardupilotwaf/ardupilotwaf.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README_waf.txt b/README_waf.txt index f90e3d7ad4..7d27055043 100644 --- a/README_waf.txt +++ b/README_waf.txt @@ -25,8 +25,8 @@ calling just 'waf' is enough It's possible to build for just a vehicle or an example by specifying it as the target: - # From the top directory, note the board name used in the target - waf --target ArduCopter.linux + # From the top directory + waf --target ArduCopter # List all the targets available waf list diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py index bcfe527202..d3ffeea38b 100644 --- a/Tools/ardupilotwaf/ardupilotwaf.py +++ b/Tools/ardupilotwaf/ardupilotwaf.py @@ -90,6 +90,7 @@ def program(bld, **kw): target = bld.bldnode.make_node(name + '.' + bld.env.BOARD) bld.program( target=target, + name=name, **kw )