fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 09:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake handle git submodule depdencies

Browse Source
This commit is contained in:
Daniel Agar
2017-11-23 00:22:45 -05:00
parent cea2c36000
commit d1a4c2dcd0
11 changed files with 79 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/check_submodules.sh
+8 -9
View File
@@ -34,8 +34,8 @@ then
echo "Continuing build with manually overridden submodule.."
elif [ "$user_cmd" == "u" ]
then
git submodule sync --recursive
git submodule update --init --recursive
git submodule sync --recursive -- $1
git submodule update --init --recursive -- $1
echo "Submodule fixed, continuing build.."
else
echo "Build aborted."
@@ -43,10 +43,9 @@ then
fi
fi
else
echo "REINITIALIZING GIT SUBMODULES"
echo "no git repo found in $1/.git"
echo "REINITIALIZING GIT SUBMODULE $1"
git submodule sync --recursive -- $1;
git submodule update --init --recursive $1;
git submodule update --init --recursive -- $1;
fi
}
@@ -54,15 +53,14 @@ fi
# If called with a path then respect $GIT_SUBMODULES_ARE_EVIL but do normal processing
if [ "$#" != "0" ];
then
# called with a path then process only that path but respect $GIT_SUBMODULES_ARE_EVIL
# called with a path then process only that path but respect $GIT_SUBMODULES_ARE_EVIL
[ -n "$GIT_SUBMODULES_ARE_EVIL" ] && {
# GIT_SUBMODULES_ARE_EVIL is set, meaning user doesn't want submodules updated
echo "GIT_SUBMODULES_ARE_EVIL is defined - Skipping submodules $1 update."
exit 0
}
git submodule update --recursive $1
git submodule update --init --recursive -- $1
else
@@ -79,4 +77,5 @@ else
done
fi
exit 0
exit 0