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

waf: add option program_name to ardupilotwaf.program()

Browse Source 
That allows one to set explictly the program name instead of getting it from
the current directory.
This commit is contained in:
Gustavo Jose de Sousa 2016-01-11 18:23:59 -02:00 committed by Lucas De Marchi
parent 2ad91dc1bc
commit 59562ad693
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tools/ardupilotwaf/ardupilotwaf.py
View File

@ -74,7 +74,10 @@ 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', use_legacy_defines=True, **kw): def program(bld, blddestdir='bin',
use_legacy_defines=True,
program_name=None,
**kw):
if 'target' in kw: if 'target' in kw:
bld.fatal('Do not pass target for program') bld.fatal('Do not pass target for program')
if 'defines' not in kw: if 'defines' not in kw:
@ -82,17 +85,21 @@ def program(bld, blddestdir='bin', use_legacy_defines=True, **kw):
if 'source' not in kw: if 'source' not in kw:
kw['source'] = bld.path.ant_glob(SOURCE_EXTS) kw['source'] = bld.path.ant_glob(SOURCE_EXTS)
name = bld.path.name if not program_name:
program_name = bld.path.name
if use_legacy_defines: if use_legacy_defines:
kw['defines'].extend(_get_legacy_defines(name)) kw['defines'].extend(_get_legacy_defines(program_name))
kw['features'] = common_features(bld) + kw.get('features', []) kw['features'] = common_features(bld) + kw.get('features', [])
if blddestdir == 'bin':
name = program_name
else:
name = blddestdir + '/' + program_name
target = bld.bldnode.find_or_declare(blddestdir + '/' + target = bld.bldnode.find_or_declare(blddestdir + '/' +
name + '.' + bld.env.BOARD) program_name + '.' + bld.env.BOARD)
if blddestdir != 'bin':
name = blddestdir + '/' + name
bld.program( bld.program(
target=target, target=target,