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

waf: be compatible with git < 1.8.5 

The -C option was added to git in version 1.8.5 which is not available
in Ubuntu 12.04.
This commit is contained in:
Lucas De Marchi 2016-05-03 15:23:24 -03:00
parent 33a699f29c
commit 5b88ae90fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/ardupilotwaf/git_submodule.py
View File

@ -40,12 +40,12 @@ import os.path
class update_submodule(Task.Task): class update_submodule(Task.Task):
color = 'BLUE' color = 'BLUE'
run_str = '${GIT} -C ${SRC_ROOT} submodule update --recursive --init -- ${SUBMODULE_PATH}' run_str = '${GIT} submodule update --recursive --init -- ${SUBMODULE_PATH}'
def runnable_status(self): def runnable_status(self):
e = self.env.get_flat e = self.env.get_flat
cmd = e('GIT'), '-C', e('SRC_ROOT'), 'submodule', 'status', '--recursive', '--', e('SUBMODULE_PATH') cmd = e('GIT'), 'submodule', 'status', '--recursive', '--', e('SUBMODULE_PATH')
out = self.generator.bld.cmd_and_log(cmd, quiet=Context.BOTH) out = self.generator.bld.cmd_and_log(cmd, quiet=Context.BOTH, cwd=self.cwd)
# git submodule status uses a blank prefix for submodules that are up # git submodule status uses a blank prefix for submodules that are up
# to date # to date
@ -80,7 +80,7 @@ def git_submodule_update(self, name):
module_node = self.bld.srcnode.make_node(os.path.join('modules', name)) module_node = self.bld.srcnode.make_node(os.path.join('modules', name))
tsk = self.create_task('update_submodule', submodule=name) tsk = self.create_task('update_submodule', submodule=name)
tsk.env.SRC_ROOT = self.bld.srcnode.abspath() tsk.cwd = self.bld.srcnode.abspath()
tsk.env.SUBMODULE_PATH = module_node.abspath() tsk.env.SUBMODULE_PATH = module_node.abspath()
_submodules_tasks[name] = tsk _submodules_tasks[name] = tsk
@ -107,6 +107,6 @@ def git_submodule(bld, git_submodule, **kw):
@conf @conf
def git_submodule_head_hash(self, name): def git_submodule_head_hash(self, name):
module_node = self.srcnode.make_node(os.path.join('modules', name)) module_node = self.srcnode.make_node(os.path.join('modules', name))
cmd = self.env.get_flat('GIT'), '-C', module_node.abspath(), 'rev-parse', 'HEAD' cmd = self.env.get_flat('GIT'), 'rev-parse', 'HEAD'
out = self.cmd_and_log(cmd, quiet=Context.BOTH) out = self.cmd_and_log(cmd, quiet=Context.BOTH, cwd=module_node.abspath())
return out.strip() return out.strip()