Skip to content

Q
qgroundcontrol
Commit ed2a7677 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent d5227b87
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
.travis.yml
View file @ ed2a7677
...@@ -199,11 +199,11 @@ after_success: ...@@ -199,11 +199,11 @@ after_success:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
# master development builds to beta track # master development builds to beta track
- GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol-daily
- if [ "${TRAVIS_TAG}" ]; then - if [ "${TRAVIS_TAG}" ]; then
GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol; GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol;
elif [ "${TRAVIS_BRANCH}" = "master" ]; then elif [ "${TRAVIS_BRANCH}" = "master" ]; then
GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta; GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol-daily;
else else
GOOGLE_PLAY_PKG=none; GOOGLE_PLAY_PKG=none;
fi fi
......
tools/update_android_version.sh
View file @ ed2a7677
...@@ -13,7 +13,7 @@ MANIFEST_FILE=android/AndroidManifest.xml ...@@ -13,7 +13,7 @@ MANIFEST_FILE=android/AndroidManifest.xml
# manifest package # manifest package
if [ "$2" = "master" ]; then if [ "$2" = "master" ]; then
QGC_PKG_NAME="org.mavlink.qgroundcontrolbeta" QGC_PKG_NAME="org.mavlink.qgroundcontrol-daily"
sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE
echo "Android package name: $QGC_PKG_NAME" echo "Android package name: $QGC_PKG_NAME"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment