Fix protocol generation and GIT upload

This commit is contained in:
Lorenz Meier
2016-06-24 12:25:15 +02:00
parent 0ba611cbe1
commit 89d76a4f57
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -36,13 +36,13 @@ mkdir -p include/mavlink/v2.0
cd include/mavlink/v2.0
git clone https://github.com/mavlink/c_library_v2.git
cd ../../..
./scripts/update_c_library.sh 2.0
./scripts/update_c_library.sh 2
# v1.0 legacy
cd $GEN_START_PATH
mkdir -p include/mavlink/v1.0
cd include/mavlink/v1.0
git clone https://github.com/mavlink/c_library_v1.git
cd ../../..
./scripts/update_c_library.sh 1.0
./scripts/update_c_library.sh 1
# XXX add build steps for other libraries as well
+2 -2
View File
@@ -30,7 +30,7 @@ function generate_headers() {
python pymavlink/tools/mavgen.py \
--output $CLIBRARY_PATH \
--lang C \
--wire-protocol $2 \
--wire-protocol $2.0 \
message_definitions/v1.0/$1.xml
}
@@ -38,7 +38,7 @@ python pymavlink/tools/mavgen.py \
MAVLINK_PATH=$PWD
MAVLINK_GIT_REMOTENAME=upstream
MAVLINK_GIT_BRANCHNAME=master
CLIBRARY_PATH=$MAVLINK_PATH/include/mavlink/v$1/c_library
CLIBRARY_PATH=$MAVLINK_PATH/include/mavlink/v$1.0/c_library_v$1
CLIBRARY_GIT_REMOTENAME=origin
CLIBRARY_GIT_BRANCHNAME=master