Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: cmake: add method get_cmake_bldnode() 

That allows a user to have access to the cmake build node before the configure
task generator is posted.
This commit is contained in:
Gustavo Jose de Sousa 2016-03-01 19:56:58 -03:00 committed by Lucas De Marchi
parent b077613f28
commit 07700a821c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Tools/ardupilotwaf/cmake.py
View File

@ -212,10 +212,7 @@ def process_cmake_configure(self):
if not isinstance(self.cmake_src, Node.Node): if not isinstance(self.cmake_src, Node.Node):
self.cmake_src = self.bld.path.find_dir(self.cmake_src) self.cmake_src = self.bld.path.find_dir(self.cmake_src)
if not hasattr(self, 'cmake_bld'): self.get_cmake_bldnode()
self.cmake_bld = self.cmake_src.get_bld()
elif not isinstance(self.cmake_bld, Node.Node):
self.cmake_bld = self.bld.bldnode.make_node(self.cmake_bld)
self.cmake_bld.mkdir() self.cmake_bld.mkdir()
self.last_build_task = None self.last_build_task = None
@ -274,6 +271,23 @@ def cmake_build(self, cmake_target, **kw):
return self.bld(**kw) return self.bld(**kw)
@taskgen_method
def get_cmake_bldnode(self):
if 'cmake_build' in self.features:
if not hasattr(self, 'cmake_config'):
self.bld.fatal('cmake_build: taskgen is missing cmake_config')
return self.bld.get_tgen_by_name(self.cmake_config).get_cmake_bldnode()
if not 'cmake_configure' in self.features:
self.bld.fatal('cmake_build: this is not a cmake_configure taskgen')
if not hasattr(self, 'cmake_bld'):
self.cmake_bld = self.cmake_src.get_bld()
elif not isinstance(self.cmake_bld, Node.Node):
self.cmake_bld = self.bld.bldnode.make_node(self.cmake_bld)
return self.cmake_bld
@taskgen_method @taskgen_method
def create_cmake_build_task(self, cmake_config, cmake_target): def create_cmake_build_task(self, cmake_config, cmake_target):
# NOTE: we'll probably need to use the full class name in waf 1.9 # NOTE: we'll probably need to use the full class name in waf 1.9