Skip to content

Commit f82884e

Browse files
mschochapage43
authored andcommitted
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 <[email protected]> Tested-by: Aaron Miller <[email protected]> Reviewed-by: Aaron Miller <[email protected]>
1 parent d55d695 commit f82884e

14 files changed

+200
-370
lines changed

.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="src" path="gen"/>
55
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6-
<classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/>
76
<classpathentry kind="lib" path="libs/OtpErlang.jar"/>
87
<classpathentry kind="output" path="bin"/>
98
</classpath>

README.markdown

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ Now that your project supports Couchbase, starting Cocuhbase is accomplished by
5252
@Override
5353
public void couchbaseStarted(String host, int port) {}
5454

55-
@Override
56-
public void installing(int completed, int total) {}
57-
5855
@Override
5956
public void exit(String error) {}
6057
};
-4.36 MB
Binary file not shown.
-103 KB
Binary file not shown.

doc/README.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ Now that your project supports Couchbase, starting Cocuhbase is accomplished by
2222
@Override
2323
public void couchbaseStarted(String host, int port) {}
2424

25-
@Override
26-
public void installing(int completed, int total) {}
27-
2825
@Override
2926
public void exit(String error) {}
3027
};

libs/commons-compress-1.0.jar

-140 KB
Binary file not shown.

overlay.zip

140 KB
Binary file not shown.

script/classpath.compress.xsl

Lines changed: 0 additions & 18 deletions
This file was deleted.

script/couchbase-internal.xml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<fail unless="couchbase.tmp.dir" message="Property couchbase.tmp.dir must be set"/>
1010
</target>
1111

12-
<target name="manual" depends="_init, update-libaries,update-assets,update-classpath,suggest-manifest">
12+
<target name="manual" depends="_init, update-libaries,update-classpath,suggest-manifest">
1313

1414
</target>
1515

@@ -26,17 +26,6 @@
2626
</copy>
2727
</target>
2828

29-
<target name="update-assets">
30-
<copy todir="${project.path}/assets">
31-
<fileset dir="${couchbase.tmp.dir}">
32-
<include name="Couchbase/assets/**/*"/>
33-
</fileset>
34-
<filtermapper>
35-
<replacestring from="Couchbase/assets/" to=""/>
36-
</filtermapper>
37-
</copy>
38-
</target>
39-
4029
<target name="check-classpath-otp">
4130
<condition property="otp.exists">
4231
<resourcecontains resource="${project.path}/.classpath" substring="libs/OtpErlang.jar"/>
@@ -45,21 +34,9 @@
4534

4635
<target name="update-classpath-otp" depends="check-classpath-otp" unless="otp.exists">
4736
<!-- backup existing .classpath -->
48-
<copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig1"/>
49-
<xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.otp.xsl" in="${project.path}/.classpath.orig1" out="${project.path}/.classpath"/>
37+
<copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig3"/>
38+
<xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.otp.xsl" in="${project.path}/.classpath.orig3" out="${project.path}/.classpath"/>
5039
</target>
51-
52-
<target name="check-classpath-compress">
53-
<condition property="commons.compress.exists">
54-
<resourcecontains resource="${project.path}/.classpath" substring="libs/commons-compress-1.0.jar"/>
55-
</condition>
56-
</target>
57-
58-
<target name="update-classpath-compress" depends="check-classpath-compress" unless="commons.compress.exists">
59-
<!-- backup existing .classpath -->
60-
<copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig1"/>
61-
<xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.compress.xsl" in="${project.path}/.classpath.orig1" out="${project.path}/.classpath"/>
62-
</target>
6340

6441
<target name="check-classpath-couchbase">
6542
<condition property="couchbase.exists">
@@ -73,9 +50,9 @@
7350
<xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.couchbase.xsl" in="${project.path}/.classpath.orig2" out="${project.path}/.classpath"/>
7451
</target>
7552

76-
<target name="update-classpath" depends="update-classpath-compress, update-classpath-couchbase, update-classpath-otp">
77-
<delete file="${project.path}/.classpath.orig1"/>
53+
<target name="update-classpath" depends="update-classpath-couchbase, update-classpath-otp">
7854
<delete file="${project.path}/.classpath.orig2"/>
55+
<delete file="${project.path}/.classpath.orig3"/>
7956
</target>
8057

8158
<!-- Permissions -->

0 commit comments

Comments
 (0)