move manifest files, change install location to auto, additional ant file tweaks

AndroidManifest.xml.in

@@ -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"
-      android.versionCode="4720656"
-      android.versionName="0.9.1-1_b1-API8"
+      android.versionCode="0"
+      android.versionName="0.0.0-0_b0-API8"
       android:installLocation="preferExternal"
       >
     <uses-permission android:name="android.permission.INTERNET" />
@@ -72,4 +72,4 @@
                   android:launchMode="singleTop" >
         </activity>
     </application>
-</manifest> 
+</manifest>

custom_rules.xml

@@ -236,7 +236,7 @@
             rp2 = 'android.versionName="' + props.getProperty("my.version.name") + '"';
 
             /* sed primary manifest */
-            cfg = File(attributes.get("mainxml"));
+            cfg = File(attributes.get("mainxml") + ".in");
             buffer = new StringBuffer();
             fi = new FileInputStream(cfg);
             reader = new BufferedReader(new InputStreamReader(fi));
@@ -250,7 +250,7 @@
             out.write(buffer.toString());
             out.close();
             /* sed secondary manifest */
-            cfg = File(attributes.get("libxml"));
+            cfg = File(attributes.get("libxml") + ".in");
             buffer = new StringBuffer();
             fi = new FileInputStream(cfg);
             reader = new BufferedReader(new InputStreamReader(fi));
@@ -423,7 +423,7 @@
     <!-- install now does both -->
     <target name="reinstall" depends="install" />
 
-    <target name="distclean" depends="clean">
+    <target name="-pre-clean">
         <delete dir="${jar.libs.dir}" verbose="${verbose}" />
         <delete file="res/drawable/i2plogo.png" verbose="${verbose}"/>
         <delete file="res/drawable/outbound.png" verbose="${verbose}"/>
@@ -445,6 +445,9 @@
         <delete file="res/raw/license_gplv3_txt" />
         <delete file="res/raw/license_lgplv3_txt" />
         <delete file="res/raw/certificates_zip" />
+    </target>
+
+    <target name="distclean" depends="clean">
         <delete file="scripts/build.number" verbose="${verbose}" />
         <delete file="scripts/version.properties" verbose="${verbose}" />
     </target>

routerjars/AndroidManifest.xml.in

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="net.i2p.android.router"
-      android.versionCode="4720656"
-      android.versionName="0.9.1-1_b1-API8"
+      android.versionCode="0"
+      android.versionName="0.0.0-0_b0-API8"
       android:installLocation="preferExternal"
       >
 
     <uses-sdk android:minSdkVersion="8" />
 
-</manifest> 
+</manifest>

routerjars/custom_rules.xml

@@ -33,6 +33,10 @@
         <mkdir dir="${out.classes.absolute.dir}" />
     </target>
 
+    <target name="-pre-clean">
+        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
+    </target>
+
     <!-- new rules -->
 
     <target name="buildrouter" depends="-dirs" >
@@ -90,7 +94,6 @@
     </target>
 
     <target name="distclean" depends="clean">
-        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
         <delete dir="jni/build/" verbose="${verbose}" />
     </target>
 

src/net/i2p/android/router/activity/InitActivities.java

@@ -20,7 +20,7 @@ import net.i2p.util.OrderedProperties;
 
 //  Wouldn't this be better as a private class in MainActivity?
 
-class Init {
+class InitActivities {
 
     private final Context ctx;
     private final String myDir;
@@ -31,7 +31,7 @@ class Init {
     private static final String PROP_NEW_VERSION = "i2p.newVersion";
     private static final String PROP_INSTALLED_VERSION = "i2p.version";
 
-    public Init(Context c) {
+    public InitActivities(Context c) {
         ctx = c;
         // This needs to be changed so that we can have an alternative place
         myDir = c.getFilesDir().getAbsolutePath();

src/net/i2p/android/router/activity/MainActivity.java

@@ -36,7 +36,7 @@ public class MainActivity extends I2PActivityBase {
         super.onCreate(savedInstanceState);
         // Init stuff here so settings work.
         _myDir = getFilesDir().getAbsolutePath();
-        Init init = new Init(this);
+        InitActivities init = new InitActivities(this);
         init.debugStuff();
         init.initialize();
 

src/net/i2p/android/router/activity/SettingsActivity.java

@@ -56,7 +56,7 @@ public class SettingsActivity extends PreferenceActivity {
             }
         }
         // Merge in new config settings, write the file.
-        Init init = new Init(this);
+        InitActivities init = new InitActivities(this);
         init.mergeResourceToFile(R.raw.router_config, "router.config", props);
         // Apply new config if we are running.
         List<RouterContext> contexts = RouterContext.listContexts();