From 0fbaeb0ea481855b53e4751e11dfbcb48d63fda5 Mon Sep 17 00:00:00 2001
From: sponge <sponge@mail.i2p>
Date: Tue, 24 Jul 2012 05:59:45 +0000
Subject: [PATCH] Don't ask for signing passphrase on the lib build

---
 custom_rules.xml               | 2 --
 routerjars/AndroidManifest.xml | 4 ++--
 routerjars/ant.properties      | 3 ---
 routerjars/custom_rules.xml    | 7 ++++++-
 scripts/setversion.sh          | 5 +++++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/custom_rules.xml b/custom_rules.xml
index aaa3ee70d..4e6859abd 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 c0c558d68..e3e5cf441 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 60abe93cf..5285a6f6f 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 f62ef8c33..ff3bdd09d 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 a25fd2b06..c55005994 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