craigmcc 2002/11/23 15:05:13
Modified: combo build.xml
Log:
Tweak processing order and selected CVS tags so that the entire build
runs on Windows. (About to check on Unix.).
Currently, the combo build omits jxpath and latka due to build errors --
most likely due to problems in my local environment.
Revision Changes Path
1.3 +42 -26 jakarta-commons/combo/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/combo/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 14 Aug 2002 00:46:50 -0000 1.2
+++ build.xml 23 Nov 2002 23:05:13 -0000 1.3
@@ -78,9 +78,9 @@
<property name="commons-beanutils.jar"
value="${combo.build.base}/beanutils/dist/commons-beanutils.jar"/>
<property name="commons-betwixt.jar"
- value="${combo.build.base}/betwixt/dist/commons-betwixt-1.0-dev.jar"/>
+
value="${combo.build.base}/betwixt/dist/commons-betwixt-1.0-beta-1.jar"/>
<property name="commons-cli.jar"
- value="${combo.build.base}/cli/dist/commons-cli.jar"/>
+ value="${combo.build.base}/cli/dist/commons-cli-1.0-beta-2-dev.jar"/>
<property name="commons-collections.jar"
value="${combo.build.base}/collections/dist/commons-collections.jar"/>
<property name="commons-dbcp.jar"
@@ -89,12 +89,14 @@
value="${combo.build.base}/digester/dist/commons-digester.jar"/>
<property name="commons-discovery.jar"
value="${combo.build.base}/discovery/dist/commons-discovery.jar"/>
+ <property name="commons-fileupload.jar"
+
value="${combo.build.base}/fileupload/dist/commons-fileupload-1.0-dev.jar"/>
<property name="commons-httpclient.jar"
value="${combo.build.base}/httpclient/dist/commons-httpclient.jar"/>
<property name="commons-jxpath.jar"
value="${combo.build.base}/jxpath/dist/commons-jxpath.jar"/>
<property name="commons-lang.jar"
- value="${combo.build.base}/lang/dist/commons-lang-1.0-dev.jar"/>
+ value="${combo.build.base}/lang/dist/commons-lang-1.0.jar"/>
<property name="commons-latka.jar"
value="${combo.build.base}/latka/dist/commons-latka.jar"/>
<property name="commons-logging.jar"
@@ -128,21 +130,22 @@
<!-- suffixes on the name. Be sure you update the JAR name properties -->
<!-- (above) when you update the CVS tag for one of these pacakges. -->
- <property name="beanutils.tag" value="BEANUTILS_1_4"/>
+ <property name="beanutils.tag" value="BEANUTILS_1_5"/>
<property name="betwixt.tag" value=""/> <!-- FIXME: release it -->
- <property name="cli.tag" value=""/> <!-- FIXME: release it -->
- <property name="collections.tag" value="COLLECTIONS_2_0"/>
+ <property name="cli.tag" value="CLI_1_0"/>
+ <property name="collections.tag" value="COLLECTIONS_2_1"/>
<property name="dbcp.tag" value="DBCP_1_0"/>
<property name="digester.tag" value="DIGESTER_1_3"/>
- <property name="discovery.tag" value=""/> <!-- FIXME: release it -->
- <property name="httpclient.tag" value="HTTPCLIENT_2_0_ALPHA_1"/>
+ <property name="discovery.tag" value="DISCOVERY_0_1"/>
+ <property name="fileupload.tag" value=""/> <!-- FIXME: release it -->
+ <property name="httpclient.tag" value="HTTPCLIENT_1_0"/>
<property name="jxpath.tag" value="JXPATH_1_0"/>
- <property name="lang.tag" value="LANG_1_0_B1"/>
+ <property name="lang.tag" value="LANG_1_0"/>
<property name="latka.tag" value="LATKA-1-0-alpha1"/>
- <property name="logging.tag" value="LOGGING_1_0_1"/>
+ <property name="logging.tag" value="LOGGING_1_0_2"/>
<property name="modeler.tag" value="MODELER_1_0"/>
<property name="pool.tag" value="POOL_1_0_1"/>
- <property name="validator.tag" value=""/> <!-- FIXME: release it -->
+ <property name="validator.tag" value="VALIDATOR_1_0"/>
<!-- ========== External Dependencies ================================= -->
@@ -210,40 +213,44 @@
<classpath>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-betwixt.jar}"/>
-<!--
<pathelement location="${commons-cli.jar}"/>
--->
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-dbcp.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-discovery.jar}"/>
+ <pathelement location="${commons-fileupload.jar}"/>
<pathelement location="${commons-httpclient.jar}"/>
+<!--
<pathelement location="${commons-jxpath.jar}"/>
+-->
<pathelement location="${commons-lang.jar}"/>
<!--
<pathelement location="${commons-latka.jar}"/>
-->
<pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${commons-validator.jar}"/>
</classpath>
<sourcepath>
<pathelement location="${combo.build.base}/beanutils/src/java"/>
<pathelement location="${combo.build.base}/betwixt/src/java"/>
-<!--
- <pathelement location="${combo.build.base}/cl/src/java"/>
--->
+ <pathelement location="${combo.build.base}/cli/src/java"/>
<pathelement location="${combo.build.base}/collections/src/java"/>
<pathelement location="${combo.build.base}/dbcp/src/java"/>
<pathelement location="${combo.build.base}/digester/src/java"/>
<pathelement location="${combo.build.base}/discovery/src/java"/>
+ <pathelement location="${combo.build.base}/fileupload/src/java"/>
<pathelement location="${combo.build.base}/httpclient/src/java"/>
+<!--
<pathelement location="${combo.build.base}/jxpath/src/java"/>
+-->
<pathelement location="${combo.build.base}/lang/src/java"/>
<!--
<pathelement location="${combo.build.base}/latka/src/java"/>
-->
<pathelement location="${combo.build.base}/logging/src/java"/>
+ <pathelement location="${combo.build.base}/modeler/src/java"/>
<pathelement location="${combo.build.base}/pool/src/java"/>
<pathelement location="${combo.build.base}/validator/src/share"/>
</sourcepath>
@@ -258,10 +265,11 @@
<mkdir dir="${combo.build.home}"/>
<mkdir dir="${combo.build.home}/classes"/>
+<!--
<mkdir dir="${combo.build.home}/${cvs.base}"/>
<copy tofile="${combo.build.home}/${cvs.base}/LICENSE"
file="LICENSE.txt"/>
-
+-->
<mkdir dir="${combo.dist.home}"/>
<mkdir dir="${combo.dist.home}/docs"/>
<mkdir dir="${combo.dist.home}/docs/api"/>
@@ -277,18 +285,18 @@
description="Check out and rebuild all included packages">
<antcall target="package">
- <param name="jar" value="${commons-discovery.jar}"/>
- <param name="package" value="discovery"/>
- <param name="tag" value="${discovery.tag}"/>
- </antcall>
-
- <antcall target="package">
<param name="jar" value="${commons-logging.jar}"/>
<param name="package" value="logging"/>
<param name="tag" value="${logging.tag}"/>
</antcall>
<antcall target="package">
+ <param name="jar" value="${commons-discovery.jar}"/>
+ <param name="package" value="discovery"/>
+ <param name="tag" value="${discovery.tag}"/>
+ </antcall>
+
+ <antcall target="package">
<param name="jar" value="${commons-collections.jar}"/>
<param name="package" value="collections"/>
<param name="tag" value="${collections.tag}"/>
@@ -306,13 +314,11 @@
<param name="tag" value="${beanutils.tag}"/>
</antcall>
-<!-- FIXME - build failures
<antcall target="package">
<param name="jar" value="${commons-cli.jar}"/>
<param name="package" value="cli"/>
<param name="tag" value="${cli.tag}"/>
</antcall>
--->
<antcall target="package">
<param name="jar" value="${commons-digester.jar}"/>
@@ -326,11 +332,13 @@
<param name="tag" value="${httpclient.tag}"/>
</antcall>
+<!-- FIXME - build failures
<antcall target="package">
<param name="jar" value="${commons-jxpath.jar}"/>
<param name="package" value="jxpath"/>
<param name="tag" value="${jxpath.tag}"/>
</antcall>
+-->
<antcall target="package">
<param name="jar" value="${commons-modeler.jar}"/>
@@ -362,6 +370,12 @@
<param name="tag" value="${dbcp.tag}"/>
</antcall>
+ <antcall target="package">
+ <param name="jar" value="${commons-fileupload.jar}"/>
+ <param name="package" value="fileupload"/>
+ <param name="tag" value="${fileupload.tag}"/>
+ </antcall>
+
<!-- FIXME - build failures
<antcall target="package">
<param name="jar" value="${commons-latka.jar}"/>
@@ -405,6 +419,8 @@
<cvs cvsRoot="${cvs.root}" command="checkout"
package="${cvs.base}/${package}" tag="${tag}"
dest="${combo.build.home}"/>
+ <copy tofile="${combo.build.home}/${cvs.base}/LICENSE"
+ file="LICENSE.txt"/>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
