From 48828a78348f9f85ca9c7863844e3bee39dee53b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 24 Jun 2015 09:36:21 +1000 Subject: [PATCH] autotest: more changes to cope with older builds without submodules --- Tools/scripts/build_binaries.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Tools/scripts/build_binaries.sh b/Tools/scripts/build_binaries.sh index 5e6c0ccfe9..90a2d27f57 100755 --- a/Tools/scripts/build_binaries.sh +++ b/Tools/scripts/build_binaries.sh @@ -43,10 +43,10 @@ checkout() { git checkout -f "$vtag" || git checkout -f "$vtag2" || { return 1 - git submodule update + [ -f $BASEDIR/.gitmodules ] && git submodule update } - git submodule update + [ -f $BASEDIR/.gitmodules ] && git submodule update git log -1 return 0 @@ -309,10 +309,12 @@ build_antennatracker() { popd } -# make sure PX4 is rebuilt from scratch -git submodule init -git submodule update +[ -f .gitmodules ] && { + git submodule init + git submodule update +} +# make sure PX4 is rebuilt from scratch pushd ArduPlane make px4-clean || exit 1 popd