From 4529028c8ab66d1e57fe5cc14b71c1d66a941a45 Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Thu, 12 May 2016 10:48:00 -0300 Subject: [PATCH] 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. --- Tools/ardupilotwaf/ardupilotwaf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py index df1e889d87..90c1277a7d 100644 --- a/Tools/ardupilotwaf/ardupilotwaf.py +++ b/Tools/ardupilotwaf/ardupilotwaf.py @@ -71,7 +71,7 @@ IGNORED_AP_LIBRARIES = [ @conf def ap_get_all_libraries(bld): 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 if name in IGNORED_AP_LIBRARIES: continue