UAVCAN as a submodule

This commit is contained in:
Pavel Kirienko
2014-07-08 20:19:17 +04:00
parent 56649bd10a
commit 6814ddccff
5 changed files with 23 additions and 1 deletions

1
.gitignore vendored
View File

@@ -36,6 +36,5 @@ mavlink/include/mavlink/v0.9/
tags tags
.tags_sorted_by_file .tags_sorted_by_file
.pydevproject .pydevproject
/uavcan
.ropeproject .ropeproject
*.orig *.orig

3
.gitmodules vendored
View File

@@ -4,3 +4,6 @@
[submodule "NuttX"] [submodule "NuttX"]
path = NuttX path = NuttX
url = git://github.com/PX4/NuttX.git url = git://github.com/PX4/NuttX.git
[submodule "uavcan"]
path = uavcan
url = git://github.com/pavel-kirienko/uavcan.git

View File

@@ -212,6 +212,9 @@ endif
$(NUTTX_SRC): $(NUTTX_SRC):
$(Q) (./Tools/check_submodules.sh) $(Q) (./Tools/check_submodules.sh)
$(UAVCAN_DIR):
$(Q) (./Tools/check_submodules.sh)
.PHONY: checksubmodules .PHONY: checksubmodules
checksubmodules: checksubmodules:
$(Q) (./Tools/check_submodules.sh) $(Q) (./Tools/check_submodules.sh)

View File

@@ -31,4 +31,20 @@ else
git submodule update; git submodule update;
fi fi
if [ -d uavcan/libuavcan_drivers ];
then
STATUSRETVAL=$(git status --porcelain | grep -i uavcan)
if [ "$STATUSRETVAL" == "" ]; then
echo "Checked uavcan submodule, correct version found"
else
echo "uavcan 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

1
uavcan Submodule

Submodule uavcan added at f66c1a7de3