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

waf: rename AP_Config.h to ap_config.h 

The usual name for this header is config.h, but that's already used by
vehicles. Using uppercase could give the impression this is a
file to be modified, but it's not. Use lowercase instead.
This commit is contained in:
Lucas De Marchi 2016-04-05 20:45:43 -07:00
parent a0ca38a03f
commit 169c350e85
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/ardupilotwaf/ardupilotwaf.py
View File

@ -104,7 +104,7 @@ def ap_program(bld,
if use_legacy_defines:
kw['defines'].extend(_get_legacy_defines(bld.path.name))
kw['cxxflags'] = kw.get('cxxflags', []) + ['-include', 'AP_Config.h']
kw['cxxflags'] = kw.get('cxxflags', []) + ['-include', 'ap_config.h']
kw['features'] = kw.get('features', []) + bld.env.AP_PROGRAM_FEATURES
program_groups = Utils.to_list(program_groups)
@ -168,7 +168,7 @@ def ap_stlib(bld, **kw):
lib_sources = lib_node.ant_glob(SOURCE_EXTS + UTILITY_SOURCE_EXTS)
sources.extend(lib_sources)
kw['cxxflags'] = kw.get('cxxflags', []) + ['-include', 'AP_Config.h']
kw['cxxflags'] = kw.get('cxxflags', []) + ['-include', 'ap_config.h']
kw['features'] = kw.get('features', []) + bld.env.AP_STLIB_FEATURES
kw['source'] = sources
kw['target'] = kw['name']

2
Tools/ardupilotwaf/cxx_checks.py
View File

@ -1,5 +1,5 @@
"""
WAF Tool that checks cxx parameters, creating the AP_Config
WAF Tool that checks cxx parameters, creating the ap_config.h
header file.
This tool needs compiler_cxx to be loaded, make sure you

4
wscript
View File

@ -114,7 +114,7 @@ def configure(cfg):
if cfg.options.submodule_update:
cfg.env.SUBMODULE_UPDATE = True
cfg.write_config_header(os.path.join(cfg.variant, 'AP_Config.h'))
cfg.write_config_header(os.path.join(cfg.variant, 'ap_config.h'))
def collect_dirs_to_recurse(bld, globs, **kw):
dirs = []
@ -219,7 +219,7 @@ def _build_recursion(bld):
bld.recurse(d)
def build(bld):
config_header = Utils.h_file(bld.bldnode.make_node('AP_Config.h').abspath())
config_header = Utils.h_file(bld.bldnode.make_node('ap_config.h').abspath())
bld.env.CCDEPS = config_header
bld.env.CXXDEPS = config_header