Permalink
Browse files

update installer to copy files from assets not TGZ

this change also removes dependency on commons-compress
this change eliminates need for install progress in delegate
documentation updated to reflect API change

Change-Id: I65c01b81520d7b585f6c64646a4bccbd199b847e
Reviewed-on: http://review.couchbase.org/9704
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Tested-by: Aaron Miller <apage43@ninjawhale.com>
Reviewed-by: Aaron Miller <apage43@ninjawhale.com>
  • Loading branch information...
1 parent d55d695 commit f82884e096e35828399d1ba1a53c04c72ef6adbb @mschoch mschoch committed with apage43 Sep 21, 2011
View
@@ -3,7 +3,6 @@
<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="libs/commons-compress-1.0.jar"/>
<classpathentry kind="lib" path="libs/OtpErlang.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -53,9 +53,6 @@ Now that your project supports Couchbase, starting Cocuhbase is accomplished by
public void couchbaseStarted(String host, int port) {}
@Override
- public void installing(int completed, int total) {}
-
- @Override
public void exit(String error) {}
};
</pre>
Deleted file not rendered
Deleted file not rendered
View
@@ -23,9 +23,6 @@ Now that your project supports Couchbase, starting Cocuhbase is accomplished by
public void couchbaseStarted(String host, int port) {}
@Override
- public void installing(int completed, int total) {}
-
- @Override
public void exit(String error) {}
};
Binary file not shown.
View
Binary file not shown.
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
-</xsl:template>
-
-<xsl:template match="classpath">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- <classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/>
- </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
@@ -9,7 +9,7 @@
<fail unless="couchbase.tmp.dir" message="Property couchbase.tmp.dir must be set"/>
</target>
- <target name="manual" depends="_init, update-libaries,update-assets,update-classpath,suggest-manifest">
+ <target name="manual" depends="_init, update-libaries,update-classpath,suggest-manifest">
</target>
@@ -26,17 +26,6 @@
</copy>
</target>
- <target name="update-assets">
- <copy todir="${project.path}/assets">
- <fileset dir="${couchbase.tmp.dir}">
- <include name="Couchbase/assets/**/*"/>
- </fileset>
- <filtermapper>
- <replacestring from="Couchbase/assets/" to=""/>
- </filtermapper>
- </copy>
- </target>
-
<target name="check-classpath-otp">
<condition property="otp.exists">
<resourcecontains resource="${project.path}/.classpath" substring="libs/OtpErlang.jar"/>
@@ -45,21 +34,9 @@
<target name="update-classpath-otp" depends="check-classpath-otp" unless="otp.exists">
<!-- backup existing .classpath -->
- <copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig1"/>
- <xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.otp.xsl" in="${project.path}/.classpath.orig1" out="${project.path}/.classpath"/>
+ <copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig3"/>
+ <xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.otp.xsl" in="${project.path}/.classpath.orig3" out="${project.path}/.classpath"/>
</target>
-
- <target name="check-classpath-compress">
- <condition property="commons.compress.exists">
- <resourcecontains resource="${project.path}/.classpath" substring="libs/commons-compress-1.0.jar"/>
- </condition>
- </target>
-
- <target name="update-classpath-compress" depends="check-classpath-compress" unless="commons.compress.exists">
- <!-- backup existing .classpath -->
- <copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig1"/>
- <xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.compress.xsl" in="${project.path}/.classpath.orig1" out="${project.path}/.classpath"/>
- </target>
<target name="check-classpath-couchbase">
<condition property="couchbase.exists">
@@ -73,9 +50,9 @@
<xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.couchbase.xsl" in="${project.path}/.classpath.orig2" out="${project.path}/.classpath"/>
</target>
- <target name="update-classpath" depends="update-classpath-compress, update-classpath-couchbase, update-classpath-otp">
- <delete file="${project.path}/.classpath.orig1"/>
+ <target name="update-classpath" depends="update-classpath-couchbase, update-classpath-otp">
<delete file="${project.path}/.classpath.orig2"/>
+ <delete file="${project.path}/.classpath.orig3"/>
</target>
<!-- Permissions -->
Oops, something went wrong. Retry.

0 comments on commit f82884e

Please sign in to comment.