Skip to content
Browse files

Update github to current mkt;

  • Loading branch information...
1 parent 0b144f0 commit 667d1d980e8bf95ab5d86469953f7e927cb400ce @apage43 apage43 committed Aug 31, 2010
Showing with 55 additions and 4 deletions.
  1. +8 −0 .classpath
  2. +33 −0 .project
  3. +3 −2 AndroidManifest.xml
  4. +1 −1 default.properties
  5. +10 −1 src/org/couchdb/android/CouchInstaller.java
View
8 .classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry kind="lib" path="lib/commons-compress-1.0.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
View
33 .project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CouchDB</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
View
5 AndroidManifest.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.couchdb.android"
- android:versionName="1.0" android:versionCode="3">
+ android:installLocation="preferExternal"
+ android:versionName="1.0-android-0.5" android:versionCode="6">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".CouchDB"
android:label="@string/app_name">
View
2 default.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-7
+target=android-8
View
11 src/org/couchdb/android/CouchInstaller.java
@@ -77,6 +77,13 @@ private static void installPackage(String pkg, Handler handler)
for (String file : installedfiles)
iLOWriter.write(file+"\n");
iLOWriter.close();
+ for (String file : installedfiles)
+ {
+ if(file.endsWith(".postinst.sh"))
+ {
+ Runtime.getRuntime().exec("sh " + file);
+ }
+ }
} else {
throw new IOException();
}
@@ -95,7 +102,9 @@ public static boolean checkInstalled() {
ArrayList<String> packages = new ArrayList<String>();
// TODO: Different CPU arch support.
- packages.add("couch-erlang-dev"); // CouchDB, Erlang, CouchJS
+ // TODO: Some kind of sane remote manifest for this (remote updater)
+ packages.add("couch-erl-1.0"); // CouchDB, Erlang, CouchJS
+ packages.add("fixup-1.0"); //Cleanup old mochi, retrigger DNS fix install.
packages.add("dns-fix"); //Add inet config to fallback on erlang resolver
if (android.os.Build.VERSION.SDK_INT == 7)
packages.add("couch-icu-driver-eclair");

0 comments on commit 667d1d9

Please sign in to comment.
Something went wrong with that request. Please try again.