From 2e8a20da95019a8d2f7a1af6b414f50b8f936e6b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 26 Apr 2024 08:59:52 +1000 Subject: [PATCH 1/3] waf: update to 2.0.27 this fixes python 3.12 support --- modules/waf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/waf b/modules/waf index 1b1625b8e7da6..b25b5c7d98c50 160000 --- a/modules/waf +++ b/modules/waf @@ -1 +1 @@ -Subproject commit 1b1625b8e7da6e1307d73335cb995fa8813d5950 +Subproject commit b25b5c7d98c502b07976740b0a65b9f39948c292 From d9a98adf555193f2b4a7a62eafcead2643e461d7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 26 Apr 2024 10:18:55 +1000 Subject: [PATCH 2/3] mavlink: support python 3.12 --- modules/mavlink | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mavlink b/modules/mavlink index 1e04d8b8634da..2825252d6d13e 160000 --- a/modules/mavlink +++ b/modules/mavlink @@ -1 +1 @@ -Subproject commit 1e04d8b8634dafc8c9a2496c6922e0749e00c009 +Subproject commit 2825252d6d13eb347520f028b3c580ab29bd78e5 From d2e9e67ebe06a62eb4429ce88d546dfc6b87f896 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 26 Apr 2024 10:52:30 +1000 Subject: [PATCH 3/3] waf: cope with CI python oddity --- Tools/ardupilotwaf/ap_library.py | 2 ++ Tools/ardupilotwaf/chibios.py | 6 +++++- Tools/ardupilotwaf/git_submodule.py | 4 ++-- wscript | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Tools/ardupilotwaf/ap_library.py b/Tools/ardupilotwaf/ap_library.py index b49010ae06001..188fe6146d391 100644 --- a/Tools/ardupilotwaf/ap_library.py +++ b/Tools/ardupilotwaf/ap_library.py @@ -206,6 +206,8 @@ def scan(self): # force dependency scan, if necessary self.compiled_task.signature() + if not self.compiled_task.uid() in self.generator.bld.node_deps: + return r, [] for n in self.generator.bld.node_deps[self.compiled_task.uid()]: # using common Node methods doesn't work here p = n.abspath() diff --git a/Tools/ardupilotwaf/chibios.py b/Tools/ardupilotwaf/chibios.py index e238e3b24a39d..a39b5cb5664d3 100644 --- a/Tools/ardupilotwaf/chibios.py +++ b/Tools/ardupilotwaf/chibios.py @@ -18,7 +18,11 @@ _dynamic_env_data = {} def _load_dynamic_env_data(bld): bldnode = bld.bldnode.make_node('modules/ChibiOS') - tmp_str = bldnode.find_node('include_dirs').read() + include_dirs_node = bldnode.find_node('include_dirs') + if include_dirs_node is None: + _dynamic_env_data['include_dirs'] = [] + return + tmp_str = include_dirs_node.read() tmp_str = tmp_str.replace(';\n','') tmp_str = tmp_str.replace('-I','') #remove existing -I flags # split, coping with separator diff --git a/Tools/ardupilotwaf/git_submodule.py b/Tools/ardupilotwaf/git_submodule.py index be28216e9c114..e2c727e05bb97 100644 --- a/Tools/ardupilotwaf/git_submodule.py +++ b/Tools/ardupilotwaf/git_submodule.py @@ -91,7 +91,7 @@ def runnable_status(self): else: r = Task.RUN_ME - if self.non_fast_forward: + if getattr(self,'non_fast_forward',[]): r = Task.SKIP_ME return r @@ -148,7 +148,7 @@ def git_submodule(bld, git_submodule, **kw): def _post_fun(bld): Logs.info('') for name, t in _submodules_tasks.items(): - if not t.non_fast_forward: + if not getattr(t,'non_fast_forward',[]): continue Logs.warn("Submodule %s not updated: non-fastforward" % name) diff --git a/wscript b/wscript index 61fffcb8beb58..cb4194af2084b 100644 --- a/wscript +++ b/wscript @@ -528,7 +528,6 @@ def configure(cfg): cfg.msg('Setting board to', cfg.options.board) cfg.get_board().configure(cfg) - cfg.load('clang_compilation_database') cfg.load('waf_unit_test') cfg.load('mavgen') cfg.load('dronecangen')