dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fixed check tools

This commit is contained in:
Lorenz Meier 2014-07-07 17:35:47 +02:00
parent 3251100947
commit 72ccbe9c4e
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -210,11 +210,11 @@ menuconfig:
endif endif
$(NUTTX_SRC): $(NUTTX_SRC):
$(Q) if [ -d $(NUTTX_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "NuttX submodule missing, doing auto checkout"; git submodule init; git submodule update; fi $(Q) (./Tools/check_submodules.sh)
.PHONY: checksubmodules .PHONY: checksubmodules
checksubmodules: checksubmodules:
$(Q) if [ -d $(MAVLINK_SRC) ]; then ./Tools/check_submodules.sh; else echo ""; echo ""; echo "MAVLink submodule missing, doing auto checkout"; git submodule init; git submodule update; fi $(Q) (./Tools/check_submodules.sh)
# #
# Testing targets # Testing targets

24
Tools/check_submodules.sh
View File

@ -1,18 +1,34 @@
#!/bin/sh #!/bin/sh
STATUSRETVAL=$(git status --porcelain | grep -i "M mavlink/include/mavlink/v1.0")
if [ -d NuttX/nuttx ];
then
STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0")
if [ "$STATUSRETVAL" == "" ]; then if [ "$STATUSRETVAL" == "" ]; then
echo "checked mavlink submodule, correct version found" echo "Checked mavlink submodule, correct version found"
else else
echo "mavlink sub repo not at correct version. Try 'git submodule update'" echo "mavlink sub repo not at correct version. Try 'git submodule update'"
echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
exit 1 exit 1
fi fi
else
git submodule init;
git submodule update;
fi
STATUSRETVAL=$(git status --porcelain | grep -i "M NuttX")
if [ -d mavlink/include/mavlink/v1.0 ];
then
STATUSRETVAL=$(git status --porcelain | grep -i "NuttX")
if [ "$STATUSRETVAL" == "" ]; then if [ "$STATUSRETVAL" == "" ]; then
echo "checked NuttX submodule, correct version found" echo "Checked NuttX submodule, correct version found"
else else
echo "NuttX sub repo not at correct version. Try 'git submodule update'" echo "NuttX sub repo not at correct version. Try 'git submodule update'"
echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
exit 1 exit 1
fi fi
else
git submodule init;
git submodule update;
fi
exit 0 exit 0