Browse Source

waf: ardupilotwaf: ap_get_all_libraries: ignore non-directory files

Each library in ardupilot is a folder with the source in. That avoids build
failures when there are files in libraries/. That fixes #4099 ("waf doesn't
seem to like TAGS files") and #4093 ("sim_vehicle.py /w waf /w eclipse project
broken on Cygwin").

That problem can be reproduced by just creating a file in libraries/ and trying
to build with waf.

There should be a better way to confirm a path is an ardupilot library. That
can be done later.
master
Gustavo Jose de Sousa 9 years ago committed by Lucas De Marchi
parent
commit
4529028c8a
  1. 2
      Tools/ardupilotwaf/ardupilotwaf.py

2
Tools/ardupilotwaf/ardupilotwaf.py

@ -71,7 +71,7 @@ IGNORED_AP_LIBRARIES = [
@conf @conf
def ap_get_all_libraries(bld): def ap_get_all_libraries(bld):
libraries = [] libraries = []
for lib_node in bld.srcnode.ant_glob('libraries/*', dir=True): for lib_node in bld.srcnode.ant_glob('libraries/*', dir=True, src=False):
name = lib_node.name name = lib_node.name
if name in IGNORED_AP_LIBRARIES: if name in IGNORED_AP_LIBRARIES:
continue continue

Loading…
Cancel
Save