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

waf: ap_library: use ap_persistent_task_sigs for header checking tasks

Browse Source 
In order to make clean builds faster.
This commit is contained in:
Gustavo Jose de Sousa 2016-08-22 17:48:55 -03:00 committed by Lucas De Marchi
parent ef4fd0e2d3
commit 6abcf6150c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/ardupilotwaf/ap_library.py
View File

@ -26,6 +26,7 @@ some of them will be rewritten, see the implementation for details).
This tool also checks if the headers used by the source files don't use This tool also checks if the headers used by the source files don't use
vehicle-related headers and fails the build if they do. vehicle-related headers and fails the build if they do.
""" """
import os
import re import re
from waflib import Errors, Task, Utils from waflib import Errors, Task, Utils
@ -151,18 +152,23 @@ class ap_library_check_headers(Task.Task):
bld = self.generator.bld bld = self.generator.bld
# force scan() to be called # force scan() to be called
bld.imp_sigs[self.uid()] = None bld.imp_sigs[self.uid()] = None
return super(ap_library_check_headers, self).signature() s = super(ap_library_check_headers, self).signature()
bld.ap_persistent_task_sigs[self.uid()] = s
return s
def scan(self): def scan(self):
r = [] r = []
self.headers = [] self.headers = []
srcnode_path = self.generator.bld.srcnode.abspath()
# force dependency scan, if necessary # force dependency scan, if necessary
self.compiled_task.signature() self.compiled_task.signature()
for n in self.generator.bld.node_deps[self.compiled_task.uid()]: for n in self.generator.bld.node_deps[self.compiled_task.uid()]:
if not n.is_src(): # using common Node methods doesn't work here
p = n.abspath()
if not p.startswith(srcnode_path):
continue continue
if n.srcpath() in self.whitelist: if os.path.relpath(p, srcnode_path) in self.whitelist:
continue continue
r.append(n) r.append(n)