aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: ardupilotwaf: rename program to ap_program

Browse Source 
Make the rename so that there is no name clashes when defining it as a taskgen
method.
This commit is contained in:
Gustavo Jose de Sousa 2016-01-21 10:10:44 -02:00 committed by Lucas De Marchi
parent 90d266698d
commit a35c0d48b0
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/wscript
View File

@ -27,7 +27,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.program( ardupilotwaf.ap_program(
bld, bld,
program_name='ardurover', program_name='ardurover',
use=vehicle + '_libs', use=vehicle + '_libs',

2
AntennaTracker/wscript
View File

@ -15,7 +15,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.program( ardupilotwaf.ap_program(
bld, bld,
program_name='antennatracker', program_name='antennatracker',
use=vehicle + '_libs', use=vehicle + '_libs',

2
ArduCopter/wscript
View File

@ -36,7 +36,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.program( ardupilotwaf.ap_program(
bld, bld,
program_name='arducopter', program_name='arducopter',
use=vehicle + '_libs', use=vehicle + '_libs',

2
ArduPlane/wscript
View File

@ -37,7 +37,7 @@ def build(bld):
use='mavlink', use='mavlink',
) )
ardupilotwaf.program( ardupilotwaf.ap_program(
bld, bld,
program_name='arduplane', program_name='arduplane',
use=vehicle + '_libs', use=vehicle + '_libs',

2
Tools/CPUInfo/wscript
View File

@ -4,7 +4,7 @@
import ardupilotwaf import ardupilotwaf
def build(bld): def build(bld):
ardupilotwaf.program( ardupilotwaf.ap_program(
bld, bld,
use='ap', use='ap',
blddestdir='tools', blddestdir='tools',

2
Tools/Replay/wscript
View File

@ -4,7 +4,7 @@
import ardupilotwaf import ardupilotwaf
def build(bld): def build(bld):
ardupilotwaf.program( ardupilotwaf.ap_program(
bld, bld,
use='ap', use='ap',
blddestdir='tools', blddestdir='tools',

8
Tools/ardupilotwaf/ardupilotwaf.py
View File

@ -75,7 +75,7 @@ def get_all_libraries(bld):
libraries.extend(['AP_HAL', 'AP_HAL_Empty']) libraries.extend(['AP_HAL', 'AP_HAL_Empty'])
return libraries return libraries
def program(bld, blddestdir='bin', def ap_program(bld, blddestdir='bin',
use_legacy_defines=True, use_legacy_defines=True,
program_name=None, program_name=None,
**kw): **kw):
@ -105,7 +105,7 @@ def program(bld, blddestdir='bin',
def example(bld, **kw): def example(bld, **kw):
kw['blddestdir'] = 'examples' kw['blddestdir'] = 'examples'
program(bld, **kw) ap_program(bld, **kw)
# NOTE: Code in libraries/ is compiled multiple times. So ensure each # NOTE: Code in libraries/ is compiled multiple times. So ensure each
# compilation is independent by providing different index for each. # compilation is independent by providing different index for each.
@ -163,7 +163,7 @@ def find_tests(bld, use=[]):
includes = [bld.srcnode.abspath() + '/tests/'] includes = [bld.srcnode.abspath() + '/tests/']
for f in bld.path.ant_glob(incl='*.cpp'): for f in bld.path.ant_glob(incl='*.cpp'):
program( ap_program(
bld, bld,
features=features, features=features,
includes=includes, includes=includes,
@ -181,7 +181,7 @@ def find_benchmarks(bld, use=[]):
includes = [bld.srcnode.abspath() + '/benchmarks/'] includes = [bld.srcnode.abspath() + '/benchmarks/']
for f in bld.path.ant_glob(incl='*.cpp'): for f in bld.path.ant_glob(incl='*.cpp'):
program( ap_program(
bld, bld,
features=common_features(bld) + ['gbenchmark'], features=common_features(bld) + ['gbenchmark'],
includes=includes, includes=includes,