diff --git a/custom_rules.xml b/custom_rules.xml index aaa3ee70d00c58061f5fec0787fc7127079d2eb4..4e6859abde4ec6aff41c55b9ede5af07aa42785d 100644 --- a/custom_rules.xml +++ b/custom_rules.xml @@ -226,6 +226,4 @@ <copy file="${out.release.file}" tofile="I2PAndroid-${my.version.name}.apk" /> <echo message="Release file copied to I2PAndroid-${my.version.name}.apk" /> </target> - - </project> diff --git a/routerjars/AndroidManifest.xml b/routerjars/AndroidManifest.xml index c0c558d683a402f3cba692867d885240fe06be4d..e3e5cf441b882b99fbf35b09823ad740e4efd0d8 100644 --- a/routerjars/AndroidManifest.xml +++ b/routerjars/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.i2p.android.router.guts" - android.versionCode="" - android.versionName="" + android.versionCode="4719040" + android.versionName="0.9.0-28_b1-API8" android:installLocation="preferExternal" > diff --git a/routerjars/ant.properties b/routerjars/ant.properties index 60abe93cfbf29b2a5f8421562323639b8b063c6d..5285a6f6f4e9e12f53d53fb7ef4b27eca24a481b 100644 --- a/routerjars/ant.properties +++ b/routerjars/ant.properties @@ -15,7 +15,4 @@ # 'key.alias' for the name of the key to use. # The password will be asked during the build when you use the 'release' target. -key.alias=${application-package} application-package=net.i2p.router -key.store.password=android -key.store=${user.home}/.android/${application-package}.keystore diff --git a/routerjars/custom_rules.xml b/routerjars/custom_rules.xml index f62ef8c337d50c91223b1fd052d472e00dab223d..ff3bdd09d4775bbc47b23c3f8680c6760f42f417 100644 --- a/routerjars/custom_rules.xml +++ b/routerjars/custom_rules.xml @@ -14,8 +14,13 @@ </fail> <echo message="Using I2P source at ${i2pbase}" /> - <target name="-pre-compile" depends="jbigi, buildrouter" /> + <!-- this loads my.version.code and my.version.name --> + <property file="../scripts/version.properties" /> + <property name="version.code" value="${my.version.code}" /> + <property name="version.name" value="${my.version.name}" /> + <echo message="version.code '${version.code}', 'version.name '${version.name}', '${my.version.name}'" /> + <target name="-pre-compile" depends="jbigi, buildrouter" /> <!-- Creates the output directories if they don't exist yet. diff --git a/scripts/setversion.sh b/scripts/setversion.sh index a25fd2b060856be80fc78271a38bf38d90f40a23..c55005994fae634e12f1bd9bfa24e10327c6750c 100755 --- a/scripts/setversion.sh +++ b/scripts/setversion.sh @@ -15,6 +15,7 @@ THISDIR=$(dirname $(readlink -ne $0)) cd $THISDIR MANIFEST=../AndroidManifest.xml +MANIFESTROUTER=../routerjars/AndroidManifest.xml TMP=AndroidManifest.xml.tmp I2PBASE=${1:-../../i2p.i2p} @@ -69,4 +70,8 @@ SUBST='s/android.versionCode="[0-9]*"/android.versionCode="'${VERSIONINT}'"/' sed "$SUBST" < $MANIFEST > $TMP SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/' sed "$SUBST" < $TMP > $MANIFEST +SUBST='s/android.versionCode="[0-9]*"/android.versionCode="'${VERSIONINT}'"/' +sed "$SUBST" < $MANIFESTROUTER > $TMP +SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/' +sed "$SUBST" < $TMP > $MANIFESTROUTER rm -f $TMP