Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update github to current mkt;

  • Loading branch information...
commit 667d1d980e8bf95ab5d86469953f7e927cb400ce 1 parent 0b144f0
Aaron Miller apage43 authored
8 .classpath
... ... @@ -0,0 +1,8 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry kind="src" path="src"/>
  4 + <classpathentry kind="src" path="gen"/>
  5 + <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
  6 + <classpathentry kind="lib" path="lib/commons-compress-1.0.jar"/>
  7 + <classpathentry kind="output" path="bin"/>
  8 +</classpath>
33 .project
... ... @@ -0,0 +1,33 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<projectDescription>
  3 + <name>CouchDB</name>
  4 + <comment></comment>
  5 + <projects>
  6 + </projects>
  7 + <buildSpec>
  8 + <buildCommand>
  9 + <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
  10 + <arguments>
  11 + </arguments>
  12 + </buildCommand>
  13 + <buildCommand>
  14 + <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
  15 + <arguments>
  16 + </arguments>
  17 + </buildCommand>
  18 + <buildCommand>
  19 + <name>org.eclipse.jdt.core.javabuilder</name>
  20 + <arguments>
  21 + </arguments>
  22 + </buildCommand>
  23 + <buildCommand>
  24 + <name>com.android.ide.eclipse.adt.ApkBuilder</name>
  25 + <arguments>
  26 + </arguments>
  27 + </buildCommand>
  28 + </buildSpec>
  29 + <natures>
  30 + <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
  31 + <nature>org.eclipse.jdt.core.javanature</nature>
  32 + </natures>
  33 +</projectDescription>
5 AndroidManifest.xml
... ... @@ -1,7 +1,8 @@
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 package="org.couchdb.android"
4   - android:versionName="1.0" android:versionCode="3">
  4 + android:installLocation="preferExternal"
  5 + android:versionName="1.0-android-0.5" android:versionCode="6">
5 6 <application android:icon="@drawable/icon" android:label="@string/app_name">
6 7 <activity android:name=".CouchDB"
7 8 android:label="@string/app_name">
2  default.properties
@@ -8,4 +8,4 @@
8 8 # project structure.
9 9
10 10 # Project target.
11   -target=android-7
  11 +target=android-8
11 src/org/couchdb/android/CouchInstaller.java
@@ -77,6 +77,13 @@ private static void installPackage(String pkg, Handler handler)
77 77 for (String file : installedfiles)
78 78 iLOWriter.write(file+"\n");
79 79 iLOWriter.close();
  80 + for (String file : installedfiles)
  81 + {
  82 + if(file.endsWith(".postinst.sh"))
  83 + {
  84 + Runtime.getRuntime().exec("sh " + file);
  85 + }
  86 + }
80 87 } else {
81 88 throw new IOException();
82 89 }
@@ -95,7 +102,9 @@ public static boolean checkInstalled() {
95 102 ArrayList<String> packages = new ArrayList<String>();
96 103
97 104 // TODO: Different CPU arch support.
98   - packages.add("couch-erlang-dev"); // CouchDB, Erlang, CouchJS
  105 + // TODO: Some kind of sane remote manifest for this (remote updater)
  106 + packages.add("couch-erl-1.0"); // CouchDB, Erlang, CouchJS
  107 + packages.add("fixup-1.0"); //Cleanup old mochi, retrigger DNS fix install.
99 108 packages.add("dns-fix"); //Add inet config to fallback on erlang resolver
100 109 if (android.os.Build.VERSION.SDK_INT == 7)
101 110 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.