I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit c1e8719d authored by str4d's avatar str4d
Browse files

Fixed bug in manifests

parent 56198bf7
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.i2p.android.router" package="net.i2p.android.router"
android.versionCode="0" android:versionCode="0"
android.versionName="0.0.0-0_b0-API8" android:versionName="0.0.0-0_b0-API8"
android:installLocation="auto" android:installLocation="auto"
> >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
......
...@@ -238,10 +238,10 @@ ...@@ -238,10 +238,10 @@
props.store(fo, "AUTO-GENERATED FILE, DO NOT EDIT!"); props.store(fo, "AUTO-GENERATED FILE, DO NOT EDIT!");
fo.close(); fo.close();
} }
sp1 = 'android.versionCode="[0-9]*"'; sp1 = 'android:versionCode="[0-9]*"';
rp1 = 'android.versionCode="' + props.getProperty("my.version.code") + '"'; rp1 = 'android:versionCode="' + props.getProperty("my.version.code") + '"';
sp2 = 'android.versionName="[^"]*"'; sp2 = 'android:versionName="[^"]*"';
rp2 = 'android.versionName="' + props.getProperty("my.version.name") + '"'; rp2 = 'android:versionName="' + props.getProperty("my.version.name") + '"';
/* sed primary manifest */ /* sed primary manifest */
cfg = File(attributes.get("mainxml") + ".in"); cfg = File(attributes.get("mainxml") + ".in");
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.i2p.android.router" package="net.i2p.android.router"
android.versionCode="0" android:versionCode="0"
android.versionName="0.0.0-0_b0-API8" android:versionName="0.0.0-0_b0-API8"
android:installLocation="auto" android:installLocation="auto"
> >
......
...@@ -66,12 +66,12 @@ echo "Android version: '$VERSIONSTRING' (${VERSIONINT})" ...@@ -66,12 +66,12 @@ echo "Android version: '$VERSIONSTRING' (${VERSIONINT})"
echo "my.version.name=${VERSIONSTRING}" > version.properties echo "my.version.name=${VERSIONSTRING}" > version.properties
echo "my.version.code=${VERSIONINT}" >> 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 sed "$SUBST" < $MANIFEST > $TMP
SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/' SUBST='s/android:versionName="[^"]*"/android:versionName="'${VERSIONSTRING}'"/'
sed "$SUBST" < $TMP > $MANIFEST 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 sed "$SUBST" < $MANIFESTROUTER > $TMP
SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/' SUBST='s/android:versionName="[^"]*"/android:versionName="'${VERSIONSTRING}'"/'
sed "$SUBST" < $TMP > $MANIFESTROUTER sed "$SUBST" < $TMP > $MANIFESTROUTER
rm -f $TMP rm -f $TMP
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment