Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: fix legacy defines 

The following fixes where applied:
 - Value for APM_BUILD_DIRECTORY must be prefixed with APM_BUILD_
 - Renamed parameter name to sketchname, so we differentiate the real program
   name from the legacy sketch name
 - Use directory name instead of program name as argument for
   _get_legacy_defines()
This commit is contained in:
Gustavo Jose de Sousa 2016-01-22 20:21:09 +00:00 committed by Lucas De Marchi
parent c2e3f05dbf
commit 53f22f4982
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/ardupilotwaf/ardupilotwaf.py
View File

@ -51,11 +51,11 @@ COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
'StorageManager',
]
def _get_legacy_defines(name):
def _get_legacy_defines(sketch_name):
return [
'APM_BUILD_DIRECTORY=' + name,
'SKETCH="' + name + '"',
'SKETCHNAME="' + name + '"',
'APM_BUILD_DIRECTORY=APM_BUILD_' + sketch_name,
'SKETCH="' + sketch_name + '"',
'SKETCHNAME="' + sketch_name + '"',
]
IGNORED_AP_LIBRARIES = [
@ -97,7 +97,7 @@ def ap_program(bld, blddestdir='bin',
program_name = bld.path.name
if use_legacy_defines:
kw['defines'].extend(_get_legacy_defines(program_name))
kw['defines'].extend(_get_legacy_defines(bld.path.name))
kw['features'] = common_features(bld) + kw.get('features', [])