waf: vehicles and antennatracker: use methods from bld

Instead of from ardupilotwaf.
This commit is contained in:
Gustavo Jose de Sousa 2016-01-21 12:04:51 -02:00 committed by Lucas De Marchi
parent a89a1a8a8a
commit e9d3dc9e72
4 changed files with 12 additions and 28 deletions

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.ap_stlib( bld.ap_stlib(
bld,
name=vehicle + '_libs', name=vehicle + '_libs',
vehicle=vehicle, vehicle=vehicle,
libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [ libraries=bld.common_vehicle_libraries() + [
'APM_Control', 'APM_Control',
'AP_Arming', 'AP_Arming',
'AP_Camera', 'AP_Camera',
@ -27,8 +24,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.ap_program( bld.ap_program(
bld,
program_name='ardurover', program_name='ardurover',
use=vehicle + '_libs', use=vehicle + '_libs',
) )

View File

@ -1,22 +1,18 @@
#!/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.ap_stlib( bld.ap_stlib(
bld,
name=vehicle + '_libs', name=vehicle + '_libs',
vehicle=vehicle, vehicle=vehicle,
libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [ libraries=bld.common_vehicle_libraries() + [
'PID', 'PID',
], ],
use='mavlink', use='mavlink',
) )
ardupilotwaf.ap_program( bld.ap_program(
bld,
program_name='antennatracker', program_name='antennatracker',
use=vehicle + '_libs', use=vehicle + '_libs',
) )

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.ap_stlib( bld.ap_stlib(
bld,
name=vehicle + '_libs', name=vehicle + '_libs',
vehicle=vehicle, vehicle=vehicle,
libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [ libraries=bld.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.ap_program( bld.ap_program(
bld,
program_name='arducopter', program_name='arducopter',
use=vehicle + '_libs', use=vehicle + '_libs',
) )

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.ap_stlib( bld.ap_stlib(
bld,
name=vehicle + '_libs', name=vehicle + '_libs',
vehicle=vehicle, vehicle=vehicle,
libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [ libraries=bld.common_vehicle_libraries() + [
'APM_Control', 'APM_Control',
'APM_OBC', 'APM_OBC',
'AP_ADSB', 'AP_ADSB',
@ -37,8 +34,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.ap_program( bld.ap_program(
bld,
program_name='arduplane', program_name='arduplane',
use=vehicle + '_libs', use=vehicle + '_libs',
) )