Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
f6493ed4
Commit
f6493ed4
authored
Feb 20, 2016
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Android build debugging
parent
b4f0cd66
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
.travis.yml
.travis.yml
+1
-0
update_android_version.sh
tools/update_android_version.sh
+5
-1
No files found.
.travis.yml
View file @
f6493ed4
...
...
@@ -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
...
...
tools/update_android_version.sh
View file @
f6493ed4
#!
/bin/
bash
#!
/usr/bin/env
bash
MANIFEST_FILE
=
android/AndroidManifest.xml
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment