diff --git a/AndroidManifest.xml b/AndroidManifest.xml.in
similarity index 97%
rename from AndroidManifest.xml
rename to AndroidManifest.xml.in
index bb8cf0834e5ffc3eeb9643184b75d8524b66b75c..6bf82b9a1214083bc53f02704610eac76a5dbdeb 100644
--- a/AndroidManifest.xml
+++ b/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>
diff --git a/custom_rules.xml b/custom_rules.xml
index b8688993a289e5805146c61b123ffcbd671b77ba..d599e223eb02417aa9909d4cd0e5d51401ef66f9 100644
--- a/custom_rules.xml
+++ b/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>
diff --git a/routerjars/AndroidManifest.xml b/routerjars/AndroidManifest.xml.in
similarity index 72%
rename from routerjars/AndroidManifest.xml
rename to routerjars/AndroidManifest.xml.in
index 16dfe047a804386242eb6313574159ca8fb51c6f..ae34c8517573d008a1fcf934ab51188c157e9539 100644
--- a/routerjars/AndroidManifest.xml
+++ b/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>
diff --git a/routerjars/custom_rules.xml b/routerjars/custom_rules.xml
index 0c7993152bb1d549498aa0c36f0f7f3c89ecffe2..056f754e957efbf6a06851db9a3df0780290f990 100644
--- a/routerjars/custom_rules.xml
+++ b/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>
diff --git a/src/net/i2p/android/router/activity/Init.java b/src/net/i2p/android/router/activity/InitActivities.java
similarity index 99%
rename from src/net/i2p/android/router/activity/Init.java
rename to src/net/i2p/android/router/activity/InitActivities.java
index 617f0c9c25f04f2bd5a8fd3e467cbf5965cff448..df653c2815131402835bdd439c4c19f0ef44f227 100644
--- a/src/net/i2p/android/router/activity/Init.java
+++ b/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();
diff --git a/src/net/i2p/android/router/activity/MainActivity.java b/src/net/i2p/android/router/activity/MainActivity.java
index 478217587c431718f20483458446477c8addb157..04e2a0c9dc73e8d40e05abe3bb11861c56043319 100644
--- a/src/net/i2p/android/router/activity/MainActivity.java
+++ b/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();
diff --git a/src/net/i2p/android/router/activity/SettingsActivity.java b/src/net/i2p/android/router/activity/SettingsActivity.java
index 89888da5beec4266a9e37a87f00a566429949054..ea6be4a44f893f84493bc519a07ffefa6e193f90 100644
--- a/src/net/i2p/android/router/activity/SettingsActivity.java
+++ b/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();