Sub: Update build script and added to build_ci.sh

This commit is contained in:
Rustom Jehangir 2016-02-15 14:48:31 -08:00 committed by Andrew Tridgell
parent 0e2f0321f9
commit 65a1d4fca1
2 changed files with 4 additions and 8 deletions

View File

@ -1,2 +1,2 @@
all: all:
@$(MAKE) -C ../ -f Makefile.waf copter @$(MAKE) -C ../ -f Makefile.waf sub

View File

@ -1,15 +1,12 @@
#!/usr/bin/env python #!/usr/bin/env python
# encoding: utf-8 # encoding: utf-8
import ardupilotwaf
def build(bld): def build(bld):
vehicle = bld.path.name vehicle = bld.path.name
ardupilotwaf.vehicle_stlib( bld.ap_stlib(
bld,
name=vehicle + '_libs', name=vehicle + '_libs',
vehicle=vehicle, vehicle=vehicle,
libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [ libraries=bld.ap_common_vehicle_libraries() + [
'AP_ADSB', 'AP_ADSB',
'AC_AttitudeControl', 'AC_AttitudeControl',
'AC_Fence', 'AC_Fence',
@ -36,8 +33,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.program( bld.ap_program(
bld,
program_name='ardusub', program_name='ardusub',
use=vehicle + '_libs', use=vehicle + '_libs',
) )