Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 10:26:52 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Update git check script. Fixes #3733

Browse Source
This commit is contained in:
Lorenz Meier
2016-02-13 00:50:06 +01:00
parent f8915104e0
commit c5b1e791bd
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -2
View File
@@ -109,9 +109,8 @@ endif
# describe how to build a cmake config # describe how to build a cmake config
define cmake-build define cmake-build
+@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(PWD)/build_$@/Makefile ]; then rm -rf $(PWD)/build_$@; fi +@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(PWD)/build_$@/Makefile ]; then rm -rf $(PWD)/build_$@; fi
+git submodule init
+Tools/check_submodules.sh
+@if [ ! -e $(PWD)/build_$@/CMakeCache.txt ]; then git submodule sync && git submodule init && mkdir -p $(PWD)/build_$@ && cd $(PWD)/build_$@ && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1); fi +@if [ ! -e $(PWD)/build_$@/CMakeCache.txt ]; then git submodule sync && git submodule init && mkdir -p $(PWD)/build_$@ && cd $(PWD)/build_$@ && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1); fi
+Tools/check_submodules.sh
+$(PX4_MAKE) -C $(PWD)/build_$@ $(PX4_MAKE_ARGS) $(ARGS) +$(PX4_MAKE) -C $(PWD)/build_$@ $(PX4_MAKE_ARGS) $(ARGS)
endef endef
Tools/check_submodules.sh
+2 -2
View File
@@ -20,13 +20,13 @@ function check_git_submodule {
if [ -d $1 ]; if [ -d $1 ];
then then
SUBMODULE_STATUS=$(git submodule summary "$1") SUBMODULE_STATUS=$(git submodule summary "$1")
STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1" | grep "<") STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1")
if [ -z "$STATUSRETVAL" ]; then if [ -z "$STATUSRETVAL" ]; then
echo "Checked $1 submodule, correct version found" echo "Checked $1 submodule, correct version found"
else else
echo -e "\033[31mChecked $1 submodule, ACTION REQUIRED:\033[0m" echo -e "\033[31mChecked $1 submodule, ACTION REQUIRED:\033[0m"
echo "" echo ""
echo -e "New commits required:" echo -e "Different commits:"
echo -e "$SUBMODULE_STATUS" echo -e "$SUBMODULE_STATUS"
echo "" echo ""
echo "" echo ""