Browse Source

UAVCAN as a submodule

sbg
Pavel Kirienko 11 years ago
parent
commit
6814ddccff
  1. 1
      .gitignore
  2. 3
      .gitmodules
  3. 3
      Makefile
  4. 16
      Tools/check_submodules.sh
  5. 1
      uavcan

1
.gitignore vendored

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

3
.gitmodules vendored

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

3
Makefile

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

16
Tools/check_submodules.sh

@ -31,4 +31,20 @@ else @@ -31,4 +31,20 @@ else
git submodule update;
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

1
uavcan

@ -0,0 +1 @@ @@ -0,0 +1 @@
Subproject commit f66c1a7de3076ff956bdf159dc3a166cbffe6089
Loading…
Cancel
Save