waf: ardupilotwaf: rename program to ap_program
Make the rename so that there is no name clashes when defining it as a taskgen method.
This commit is contained in:
parent
90d266698d
commit
a35c0d48b0
@ -27,7 +27,7 @@ def build(bld):
|
||||
use='mavlink',
|
||||
)
|
||||
|
||||
ardupilotwaf.program(
|
||||
ardupilotwaf.ap_program(
|
||||
bld,
|
||||
program_name='ardurover',
|
||||
use=vehicle + '_libs',
|
||||
|
@ -15,7 +15,7 @@ def build(bld):
|
||||
use='mavlink',
|
||||
)
|
||||
|
||||
ardupilotwaf.program(
|
||||
ardupilotwaf.ap_program(
|
||||
bld,
|
||||
program_name='antennatracker',
|
||||
use=vehicle + '_libs',
|
||||
|
@ -36,7 +36,7 @@ def build(bld):
|
||||
use='mavlink',
|
||||
)
|
||||
|
||||
ardupilotwaf.program(
|
||||
ardupilotwaf.ap_program(
|
||||
bld,
|
||||
program_name='arducopter',
|
||||
use=vehicle + '_libs',
|
||||
|
@ -37,7 +37,7 @@ def build(bld):
|
||||
use='mavlink',
|
||||
)
|
||||
|
||||
ardupilotwaf.program(
|
||||
ardupilotwaf.ap_program(
|
||||
bld,
|
||||
program_name='arduplane',
|
||||
use=vehicle + '_libs',
|
||||
|
@ -4,7 +4,7 @@
|
||||
import ardupilotwaf
|
||||
|
||||
def build(bld):
|
||||
ardupilotwaf.program(
|
||||
ardupilotwaf.ap_program(
|
||||
bld,
|
||||
use='ap',
|
||||
blddestdir='tools',
|
||||
|
@ -4,7 +4,7 @@
|
||||
import ardupilotwaf
|
||||
|
||||
def build(bld):
|
||||
ardupilotwaf.program(
|
||||
ardupilotwaf.ap_program(
|
||||
bld,
|
||||
use='ap',
|
||||
blddestdir='tools',
|
||||
|
@ -75,7 +75,7 @@ def get_all_libraries(bld):
|
||||
libraries.extend(['AP_HAL', 'AP_HAL_Empty'])
|
||||
return libraries
|
||||
|
||||
def program(bld, blddestdir='bin',
|
||||
def ap_program(bld, blddestdir='bin',
|
||||
use_legacy_defines=True,
|
||||
program_name=None,
|
||||
**kw):
|
||||
@ -105,7 +105,7 @@ def program(bld, blddestdir='bin',
|
||||
|
||||
def example(bld, **kw):
|
||||
kw['blddestdir'] = 'examples'
|
||||
program(bld, **kw)
|
||||
ap_program(bld, **kw)
|
||||
|
||||
# NOTE: Code in libraries/ is compiled multiple times. So ensure each
|
||||
# compilation is independent by providing different index for each.
|
||||
@ -163,7 +163,7 @@ def find_tests(bld, use=[]):
|
||||
includes = [bld.srcnode.abspath() + '/tests/']
|
||||
|
||||
for f in bld.path.ant_glob(incl='*.cpp'):
|
||||
program(
|
||||
ap_program(
|
||||
bld,
|
||||
features=features,
|
||||
includes=includes,
|
||||
@ -181,7 +181,7 @@ def find_benchmarks(bld, use=[]):
|
||||
includes = [bld.srcnode.abspath() + '/benchmarks/']
|
||||
|
||||
for f in bld.path.ant_glob(incl='*.cpp'):
|
||||
program(
|
||||
ap_program(
|
||||
bld,
|
||||
features=common_features(bld) + ['gbenchmark'],
|
||||
includes=includes,
|
||||
|
Loading…
Reference in New Issue
Block a user