Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed versionName from Manifest, asking while compiling release or set using git describe when compiling debug + value logged at linphone startup

Browse source
This commit is contained in:
Sylvain Berfini 2013-01-10 16:57:45 +01:00
parent 4487ada6d3
commit 2ea8a18947
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="2003" android:versionName="2.0.3" android:installLocation="auto"> android:versionCode="2003" android:installLocation="auto">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/> <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
<!-- Permissions for Push Notification --> <!-- Permissions for Push Notification -->

6
Makefile
View file

@ -5,6 +5,7 @@ NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
LINPHONE_VERSION=$(shell cd submodules/linphone && git describe) LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe)
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
BUILD_X264=0 BUILD_X264=0
@ -90,10 +91,10 @@ generate-libs:
update-project: update-project:
$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) $(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
touch default.properties
generate-apk: generate-apk:
ant partial-clean ant partial-clean
echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
ant debug ant debug
install-apk: install-apk:
@ -101,6 +102,9 @@ install-apk:
release: update-project release: update-project
ant clean ant clean
echo "What is the version name for the release ?"; \
read version; \
echo "version.name=$$version" > default.properties
ant release ant release
run-linphone: run-linphone:

4
custom_rules.xml
View file

@ -62,7 +62,7 @@
</javadoc> </javadoc>
</target> </target>
<target name="-package-resources" depends="-crunch"> <target name="-package-resources" depends="-crunch">
<!-- only package resources if *not* a library project --> <!-- only package resources if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not package resources..."> <do-only-if-not-library elseText="Library project: do not package resources...">
<exec executable="${aapt}" failonerror="true"> <exec executable="${aapt}" failonerror="true">
@ -71,6 +71,8 @@
<arg value="-v" /> <arg value="-v" />
<arg value="--version-code" /> <arg value="--version-code" />
<arg value="${version.code}" /> <arg value="${version.code}" />
<arg value="--version-name" />
<arg value="${version.name}" />
<arg value="--debug-mode" /> <arg value="--debug-mode" />
<arg value="-m" /> <arg value="-m" />
<arg value="-u" /> <arg value="-u" />

2
src/org/linphone/LinphoneService.java
View file

@ -418,7 +418,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
} catch (NameNotFoundException nnfe) {} } catch (NameNotFoundException nnfe) {}
if (info != null) { if (info != null) {
Log.i("Linphone version is ", info.versionCode); Log.i("Linphone version is ", info.versionName + " (" + info.versionCode + ")");
} else { } else {
Log.i("Linphone version is unknown"); Log.i("Linphone version is unknown");
} }