Author: henning
Date: Tue Nov 21 02:41:08 2006
New Revision: 477615
URL: http://svn.apache.org/viewvc?view=rev&rev=477615
Log:
make oro, commons-lang and commons-collections name configurable. Another
"let's all bend over for gump" fix. :-P
Modified:
jakarta/velocity/engine/trunk/build/build.properties
jakarta/velocity/engine/trunk/build/build.xml
jakarta/velocity/engine/trunk/build/download.xml
Modified: jakarta/velocity/engine/trunk/build/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/build.properties?view=diff&rev=477615&r1=477614&r2=477615
==============================================================================
--- jakarta/velocity/engine/trunk/build/build.properties (original)
+++ jakarta/velocity/engine/trunk/build/build.properties Tue Nov 21 02:41:08
2006
@@ -108,5 +108,13 @@
jar.servletapi.version= 2.3
jar.werken-xpath.version= 0.9.4
+#
+# Gump wants to override these names, so make
+# it configurable...
+#
+jar.oro.name= oro
+jar.commons-collections.name= commons-collections
+jar.commons-lang.name = commons-lang
+
jar.hsqldb.version= 1.7.1
jar.junit.version= 3.8.1
Modified: jakarta/velocity/engine/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/build.xml?view=diff&rev=477615&r1=477614&r2=477615
==============================================================================
--- jakarta/velocity/engine/trunk/build/build.xml (original)
+++ jakarta/velocity/engine/trunk/build/build.xml Tue Nov 21 02:41:08 2006
@@ -371,7 +371,7 @@
<!-- ================================================================ -->
<target name="build-dependency-classes">
<mkdir dir="${build.deps}"/>
- <unzip
src="${build.lib}/commons-collections-${jar.commons-collections.version}.jar"
dest="${build.deps}">
+ <unzip
src="${build.lib}/${jar.commons-collections.name}-${jar.commons-collections.version}.jar"
dest="${build.deps}">
<!-- we only want a few files from commons collections -->
<patternset>
<include name="org/apache/commons/collections/BoundedMap.class" />
@@ -394,8 +394,8 @@
</patternset>
</unzip>
- <unzip src="${build.lib}/oro-${jar.oro.version}.jar"
dest="${build.deps}"/>
- <unzip src="${build.lib}/commons-lang-${jar.commons-lang.version}.jar"
dest="${build.deps}"/>
+ <unzip src="${build.lib}/${jar.oro.name}-${jar.oro.version}.jar"
dest="${build.deps}"/>
+ <unzip
src="${build.lib}/${jar.commons-lang.name}-${jar.commons-lang.version}.jar"
dest="${build.deps}"/>
<delete dir="${build.deps}/META-INF" quiet="true"/>
</target>
Modified: jakarta/velocity/engine/trunk/build/download.xml
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/download.xml?view=diff&rev=477615&r1=477614&r2=477615
==============================================================================
--- jakarta/velocity/engine/trunk/build/download.xml (original)
+++ jakarta/velocity/engine/trunk/build/download.xml Tue Nov 21 02:41:08 2006
@@ -77,13 +77,13 @@
</target>
<target name="commons-collections-download">
- <property name="download.jarname" value="commons-collections" />
+ <property name="download.jarname" value="${jar.commons-collections.name}" />
<property name="download.jarversion"
value="${jar.commons-collections.version}" />
<antcall target="http-download"/>
</target>
<target name="commons-lang-download">
- <property name="download.jarname" value="commons-lang" />
+ <property name="download.jarname" value="${jar.commons-lang.name}" />
<property name="download.jarversion" value="${jar.commons-lang.version}" />
<antcall target="http-download"/>
</target>
@@ -101,7 +101,7 @@
</target>
<target name="oro-download">
- <property name="download.jarname" value="oro" />
+ <property name="download.jarname" value="${jar.oro.name}" />
<property name="download.jarversion" value="${jar.oro.version}" />
<antcall target="http-download"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
