Permalink
Browse files

fix ant scripts so they do not show errors in eclipse

also fixed bug causing service to be added multiple times

Change-Id: I89ee6a53cf1cf49d980d3613b9fa71c42dbe2311
Reviewed-on: http://review.couchbase.org/9298
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Tested-by: Chris Anderson <jchris@couchbase.com>
  • Loading branch information...
1 parent 7cbae25 commit ab1d0f351bf66f662773a9014a3a340590d676e1 @mschoch mschoch committed with Chris Anderson Aug 30, 2011
Showing with 8 additions and 4 deletions.
  1. +6 −2 script/couchbase-internal.xml
  2. +2 −2 script/couchbase.xml
@@ -1,5 +1,9 @@
<project name="couchbase-internal" default="help">
+ <target name="help">
+ <echo>This build file should only be executed by couchbase.xml</echo>
+ </target>
+
<target name="update-libaries">
<unzip src="Couchbase.zip" dest="libs">
<patternset>
@@ -142,7 +146,7 @@
<target name="check-manifest-service">
<condition property="service.couch.exists">
- <resourcecontains resource="${basedir}/AndroidManifest.xml" substring="com.couchbase.libcouch.CouchService"/>
+ <resourcecontains resource="${basedir}/AndroidManifest.xml" substring="com.couchbase.android.CouchbaseService"/>
</condition>
</target>
@@ -154,4 +158,4 @@
<delete file="AndroidManifest.xml.orig.cs"/>
</target>
-</project>
+</project>
View
@@ -1,10 +1,10 @@
<project name="couchbase" default="manual">
- <include>
+ <import>
<javaresource name="Couchbase/script/couchbase-internal.xml">
<classpath location="Couchbase.zip"/>
</javaresource>
- </include>
+ </import>
<target name="manual" depends="couchbase-internal.update-libaries,couchbase-internal.update-assets,couchbase-internal.update-classpath,couchbase-internal.suggest-manifest">

0 comments on commit ab1d0f3

Please sign in to comment.