Commit c53e0765 authored by Remek Zajac's avatar Remek Zajac

automated android version

parent e969a644
......@@ -195,6 +195,11 @@ exists ($$PWD/.git) {
MAC_VERSION = $$section(VERSION, ".", 0, 2)
MAC_BUILD = $$section(VERSION, ".", 3, 3)
message(QGroundControl version $${MAC_VERSION} build $${MAC_BUILD} describe $${GIT_VERSION})
} AndroidBuild {
ANDROID_VERSION_NAME = $${GIT_VERSION}
ANDROID_VERSION_CODE = $$split(VERSION, .)
ANDROID_VERSION_CODE = $$system(echo $((100000*$$member(ANDROID_VERSION_CODE, 0)+10000*$$member(ANDROID_VERSION_CODE, 1)+1000*$$member(ANDROID_VERSION_CODE, 2))))
message(QGroundControl ANDROID_VERSION_NAME \'$${ANDROID_VERSION_NAME}\' ANDROID_VERSION_CODE \'$${ANDROID_VERSION_CODE}\')
} else {
message(QGroundControl $${GIT_VERSION})
}
......
<?xml version="1.0"?>
<manifest package="org.mavlink.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.0.0-243-gd759437" android:versionCode="300243" android:installLocation="auto">
<manifest package="org.mavlink.qgroundcontrol" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.mavlink.qgroundcontrol.QGCActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="sensorLandscape" android:launchMode="singleTask" android:keepScreenOn="true">
<intent-filter>
......
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