From 65e19fd9afd29fad40d733f8fdc4344234225fbd Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Fri, 22 Jul 2016 19:19:44 -0300 Subject: [PATCH] waf: don't update submodules if not a git repository That is useful for releases tarballs. --- wscript | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index fa510d32ec..f94d15c175 100644 --- a/wscript +++ b/wscript @@ -141,7 +141,23 @@ def configure(cfg): cfg.load('clang_compilation_database') cfg.load('waf_unit_test') cfg.load('mavgen') - cfg.load('git_submodule') + + cfg.env.SUBMODULE_UPDATE = cfg.options.submodule_update + + cfg.start_msg('Source is git repository') + if cfg.srcnode.find_node('.git'): + cfg.end_msg('yes') + else: + cfg.end_msg('no') + cfg.env.SUBMODULE_UPDATE = False + + cfg.start_msg('Update submodules') + if cfg.env.SUBMODULE_UPDATE: + cfg.end_msg('yes') + cfg.load('git_submodule') + else: + cfg.end_msg('no') + if cfg.options.enable_benchmarks: cfg.load('gbenchmark') cfg.load('gtest') @@ -172,9 +188,6 @@ def configure(cfg): 'SKETCHBOOK="' + cfg.srcnode.abspath() + '"', ]) - if cfg.options.submodule_update: - cfg.env.SUBMODULE_UPDATE = True - # Always use system extensions cfg.define('_GNU_SOURCE', 1)