ardupilotwaf: remove legacy source header dependency scanning logic

Tools/ardupilotwaf/ap_library.py

@@ -199,9 +199,7 @@ def signature(self):
         bld = self.generator.bld
         # force scan() to be called
         bld.imp_sigs[self.uid()] = None
-        s = super(ap_library_check_headers, self).signature()
-        bld.ap_persistent_task_sigs[self.uid()] = s
-        return s
+        return super(ap_library_check_headers, self).signature()
 
     def scan(self):
         r = []

Tools/ardupilotwaf/ardupilotwaf.py

@@ -11,8 +11,6 @@
 from collections import OrderedDict
 import subprocess
 
-import ap_persistent
-
 SOURCE_EXTS = [
     '*.S',
     '*.c',
@@ -709,16 +707,6 @@ def options(opt):
 
     g = opt.ap_groups['clean']
 
-    g.add_option('--clean-all-sigs',
-        action='store_true',
-        help='''Clean signatures for all tasks. By default, tasks that scan for
-implicit dependencies (like the compilation tasks) keep the dependency
-information across clean commands, so that that information is changed
-only when really necessary. Also, some tasks that don't really produce
-files persist their signature. This option avoids that behavior when
-cleaning the build.
-''')
-
     g.add_option('--asan',
         action='store_true',
         help='''Build using the macOS clang Address Sanitizer. In order to run with

Tools/ardupilotwaf/toolchain.py

@@ -139,10 +139,7 @@ def configure(cfg):
         return
 
     if cfg.env.TOOLCHAIN == 'native':
-        cfg.load('compiler_cxx compiler_c')
-
-        if not cfg.options.disable_gccdeps:
-            cfg.load('gccdeps')
+        cfg.load('compiler_cxx compiler_c gccdeps')
 
         return
 
@@ -152,16 +149,13 @@ def configure(cfg):
         cfg.find_program('ar', var='AR', quiet=True)
     else:
         cfg.find_program('%s-ar' % cfg.env.TOOLCHAIN, var='AR', quiet=True)
-    cfg.load('compiler_cxx compiler_c')
+    cfg.load('compiler_cxx compiler_c gccdeps')
 
     if sys.platform.startswith("cygwin"):
         cfg.find_program('nm', var='NM')
     else:
         cfg.find_program('%s-nm' % cfg.env.TOOLCHAIN, var='NM')
 
-    if not cfg.options.disable_gccdeps:
-        cfg.load('gccdeps')
-
     if cfg.env.COMPILER_CC == 'clang':
         cfg.env.CFLAGS += cfg.env.CLANG_FLAGS
         cfg.env.LINKFLAGS_cprogram += cfg.env.CLANG_FLAGS

wscript

@@ -194,11 +194,6 @@ def options(opt):
         default=None,
         help='Override default toolchain used for the board. Use "native" for using the host toolchain.')
 
-    g.add_option('--disable-gccdeps',
-        action='store_true',
-        default=False,
-        help='Disable the use of GCC dependencies output method and use waf default method.')
-
     g.add_option('--enable-asserts',
         action='store_true',
         default=False,