Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

waf: support python 3.12 #26889

Merged
merged 3 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Tools/ardupilotwaf/ap_library.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 5 additions & 1 deletion Tools/ardupilotwaf/chibios.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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
Expand Down
4 changes: 2 additions & 2 deletions Tools/ardupilotwaf/git_submodule.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion modules/mavlink
Submodule mavlink updated 1 files
+1 −1 pymavlink
2 changes: 1 addition & 1 deletion modules/waf
Submodule waf updated 234 files
1 change: 0 additions & 1 deletion wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Loading