Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated installer to support OtpErlang version number

Change-Id: Idcff30594768422171e7b5ee9b240340b849022f
Reviewed-on: http://review.couchbase.org/11272
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Tested-by: Marty Schoch <marty.schoch@gmail.com>
  • Loading branch information...
commit 201d1549687cd53721f01eeb13111680ce6b32df 1 parent aa56a92
@mschoch mschoch authored
View
1  build.xml
@@ -103,6 +103,7 @@
<fileset dir="script"/>
<filterset>
<filter token="VERSION" value="${version}"/>
+ <filter token="OTPVERSION" value="${otp.version}"/>
</filterset>
</copy>
</target>
View
7 script/classpath.otp.xsl
@@ -2,6 +2,9 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<!-- remove existing references to OtpErlang jar -->
+<xsl:template match="classpathentry[contains(@path, 'libs/OtpErlang')]"></xsl:template>
+
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
@@ -10,8 +13,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="classpath">
<xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- <classpathentry kind="lib" path="libs/OtpErlang.jar"/>
+ <xsl:apply-templates select="classpathentry|text()"/>
+ <classpathentry kind="lib" path="libs/OtpErlang-@OTPVERSION@.jar"/>
</xsl:copy>
</xsl:template>
View
19 script/couchbase-internal.xml
@@ -17,29 +17,18 @@
<!-- delete old couchbase jar -->
<delete quiet="true">
<fileset dir="${project.path}/libs" includes="couchbase*.jar"/>
+ <fileset dir="${project.path}/libs" includes="OtpErlang*.jar"/>
</delete>
<unzip dest="${project.path}" src="${couchbase.tmp.dir}/overlay.zip"/>
</target>
- <target name="check-classpath-otp">
- <condition property="otp.exists">
- <resourcecontains resource="${project.path}/.classpath" substring="libs/OtpErlang.jar"/>
- </condition>
- </target>
-
- <target name="update-classpath-otp" depends="check-classpath-otp" unless="otp.exists">
+ <target name="update-classpath-otp">
<!-- backup existing .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-couchbase">
- <condition property="couchbase.exists">
- <resourcecontains resource="${project.path}/.classpath" substring="libs/couchbase.jar"/>
- </condition>
- </target>
+ </target>
- <target name="update-classpath-couchbase" depends="check-classpath-couchbase" unless="couchbase.exists">
+ <target name="update-classpath-couchbase">
<!-- backup existing .classpath -->
<copy file="${project.path}/.classpath" tofile="${project.path}/.classpath.orig2"/>
<xslt style="${couchbase.tmp.dir}/Couchbase/script/classpath.couchbase.xsl" in="${project.path}/.classpath.orig2" out="${project.path}/.classpath"/>
Please sign in to comment.
Something went wrong with that request. Please try again.