Browse Source

Android build debugging

QGC4.4
Lorenz Meier 9 years ago
parent
commit
f6493ed479
  1. 1
      .travis.yml
  2. 6
      tools/update_android_version.sh

1
.travis.yml

@ -114,6 +114,7 @@ before_script: @@ -114,6 +114,7 @@ before_script:
- if [ "${CONFIG}" != "doxygen" ]; then mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; fi
script:
- echo "Build dir: ${TRAVIS_BUILD_DIR}"
- cd ${TRAVIS_BUILD_DIR} && ./tools/update_android_version.sh
- echo 'Building QGroundControl' && echo -en 'travis_fold:start:script.1\\r'
- if [ "${CONFIG}" != "doxygen" ]; then cd ${SHADOW_BUILD_DIR} && make -j4; fi

6
tools/update_android_version.sh

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
#! /bin/bash
#!/usr/bin/env bash
MANIFEST_FILE=android/AndroidManifest.xml
@ -10,12 +10,16 @@ echo "VersionName: ${VERSIONNAME}" @@ -10,12 +10,16 @@ echo "VersionName: ${VERSIONNAME}"
if [ -n "$VERSIONCODE" ]; then
sed -i -e "s/android:versionCode=\"[0-9][0-9]*\"/android:versionCode=\"$VERSIONCODE\"/" $MANIFEST_FILE
echo "Android version: ${VERSIONCODE}"
else
echo "Error versionCode empty"
exit 1
fi
if [ -n "$VERSIONNAME" ]; then
sed -i -e 's/versionName *= *"[^"]*"/versionName="'$VERSIONNAME'"/' $MANIFEST_FILE
echo "Android name: ${VERSIONNAME}"
else
echo "Error versionName empty"
exit 1
fi

Loading…
Cancel
Save