Browse Source

waf: fixes for python 3.7

master
Andrew Tridgell 7 years ago
parent
commit
36af9eecdf
  1. 4
      Tools/ardupilotwaf/cmake.py
  2. 5
      wscript

4
Tools/ardupilotwaf/cmake.py

@ -200,10 +200,6 @@ class cmake_build_task(Task.Task): @@ -200,10 +200,6 @@ class cmake_build_task(Task.Task):
def keyword(self):
return 'CMake Build'
# allow tasks to depend on possible headers or other resources if the user
# declares outputs for the cmake build
cmake_build_task = Task.update_outputs(cmake_build_task)
cmake_build_task.original_post_run = cmake_build_task.post_run
def _cmake_build_task_post_run(self):
self.output_patterns = Utils.to_list(self.output_patterns)

5
wscript

@ -155,11 +155,12 @@ configuration in order to save typing. @@ -155,11 +155,12 @@ configuration in order to save typing.
def _collect_autoconfig_files(cfg):
for m in sys.modules.values():
paths = []
if hasattr(m, '__file__'):
if hasattr(m, '__file__') and m.__file__ is not None:
paths.append(m.__file__)
elif hasattr(m, '__path__'):
for p in m.__path__:
paths.append(p)
if p is not None:
paths.append(p)
for p in paths:
if p in cfg.files or not os.path.isfile(p):

Loading…
Cancel
Save