From c1e8719d0e6b7dc7d8d6dd65058433b035964bb4 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 14 Aug 2013 04:46:04 +0000
Subject: [PATCH] Fixed bug in manifests
---
AndroidManifest.xml.in | 4 ++--
custom_rules.xml | 8 ++++----
routerjars/AndroidManifest.xml.in | 4 ++--
scripts/setversion.sh | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/AndroidManifest.xml.in b/AndroidManifest.xml.in
index 6ea5c3f43..e885b7ec3 100644
--- a/AndroidManifest.xml.in
+++ 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="0"
- android.versionName="0.0.0-0_b0-API8"
+ android:versionCode="0"
+ android:versionName="0.0.0-0_b0-API8"
android:installLocation="auto"
>
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/custom_rules.xml b/custom_rules.xml
index 66833a762..64335524a 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -238,10 +238,10 @@
props.store(fo, "AUTO-GENERATED FILE, DO NOT EDIT!");
fo.close();
}
- sp1 = 'android.versionCode="[0-9]*"';
- rp1 = 'android.versionCode="' + props.getProperty("my.version.code") + '"';
- sp2 = 'android.versionName="[^"]*"';
- rp2 = 'android.versionName="' + props.getProperty("my.version.name") + '"';
+ sp1 = 'android:versionCode="[0-9]*"';
+ rp1 = 'android:versionCode="' + props.getProperty("my.version.code") + '"';
+ sp2 = 'android:versionName="[^"]*"';
+ rp2 = 'android:versionName="' + props.getProperty("my.version.name") + '"';
/* sed primary manifest */
cfg = File(attributes.get("mainxml") + ".in");
diff --git a/routerjars/AndroidManifest.xml.in b/routerjars/AndroidManifest.xml.in
index 4f76fdedf..cd7a189d1 100644
--- a/routerjars/AndroidManifest.xml.in
+++ b/routerjars/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="0"
- android.versionName="0.0.0-0_b0-API8"
+ android:versionCode="0"
+ android:versionName="0.0.0-0_b0-API8"
android:installLocation="auto"
>
diff --git a/scripts/setversion.sh b/scripts/setversion.sh
index c55005994..6fb899548 100755
--- a/scripts/setversion.sh
+++ b/scripts/setversion.sh
@@ -66,12 +66,12 @@ echo "Android version: '$VERSIONSTRING' (${VERSIONINT})"
echo "my.version.name=${VERSIONSTRING}" > version.properties
echo "my.version.code=${VERSIONINT}" >> version.properties
-SUBST='s/android.versionCode="[0-9]*"/android.versionCode="'${VERSIONINT}'"/'
+SUBST='s/android:versionCode="[0-9]*"/android:versionCode="'${VERSIONINT}'"/'
sed "$SUBST" < $MANIFEST > $TMP
-SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/'
+SUBST='s/android:versionName="[^"]*"/android:versionName="'${VERSIONSTRING}'"/'
sed "$SUBST" < $TMP > $MANIFEST
-SUBST='s/android.versionCode="[0-9]*"/android.versionCode="'${VERSIONINT}'"/'
+SUBST='s/android:versionCode="[0-9]*"/android:versionCode="'${VERSIONINT}'"/'
sed "$SUBST" < $MANIFESTROUTER > $TMP
-SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/'
+SUBST='s/android:versionName="[^"]*"/android:versionName="'${VERSIONSTRING}'"/'
sed "$SUBST" < $TMP > $MANIFESTROUTER
rm -f $TMP
--
GitLab