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

bugfixes for checks and tools

This commit is contained in:
Lorenz Meier 2014-07-07 22:20:55 +02:00
parent 6a8990b3ba
commit 2eb018b273
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -218,6 +218,7 @@ checksubmodules:
.PHONY: updatesubmodules .PHONY: updatesubmodules
updatesubmodules: updatesubmodules:
$(Q) (git submodule init)
$(Q) (git submodule update) $(Q) (git submodule update)
# #

32
Tools/check_submodules.sh
View File

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