From 86b57e230f0274427eaf8b248834a97de7ba4438 Mon Sep 17 00:00:00 2001 From: Rustom Jehangir Date: Mon, 15 Feb 2016 14:48:31 -0800 Subject: [PATCH] Sub: Update build script and added to build_ci.sh --- ArduSub/Makefile.waf | 2 +- ArduSub/wscript | 10 +++------- Tools/scripts/build_ci.sh | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ArduSub/Makefile.waf b/ArduSub/Makefile.waf index 505aa5979a..23e85e58f5 100644 --- a/ArduSub/Makefile.waf +++ b/ArduSub/Makefile.waf @@ -1,2 +1,2 @@ all: - @$(MAKE) -C ../ -f Makefile.waf copter + @$(MAKE) -C ../ -f Makefile.waf sub diff --git a/ArduSub/wscript b/ArduSub/wscript index 1a527c1dfa..de2c3e0066 100644 --- a/ArduSub/wscript +++ b/ArduSub/wscript @@ -1,15 +1,12 @@ #!/usr/bin/env python # encoding: utf-8 -import ardupilotwaf - def build(bld): vehicle = bld.path.name - ardupilotwaf.vehicle_stlib( - bld, + bld.ap_stlib( name=vehicle + '_libs', vehicle=vehicle, - libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [ + libraries=bld.ap_common_vehicle_libraries() + [ 'AP_ADSB', 'AC_AttitudeControl', 'AC_Fence', @@ -36,8 +33,7 @@ def build(bld): use='mavlink', ) - ardupilotwaf.program( - bld, + bld.ap_program( program_name='ardusub', use=vehicle + '_libs', ) diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh index e054ebd6f3..78d8f5adf3 100755 --- a/Tools/scripts/build_ci.sh +++ b/Tools/scripts/build_ci.sh @@ -25,6 +25,7 @@ declare -A waf_supported_boards build_platforms=( ["ArduPlane"]="navio raspilot minlure bebop sitl linux px4-v2" ["ArduCopter"]="navio raspilot minlure bebop sitl linux px4-v2 px4-v4" + ["ArduSub"]="navio raspilot minlure bebop linux px4-v2 px4-v4" ["APMrover2"]="navio raspilot minlure bebop sitl linux px4-v2" ["AntennaTracker"]="navio raspilot minlure bebop sitl linux px4-v2" ["Tools/Replay"]="linux")