You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2002/05/08 18:43:03 UTC
cvs commit: jakarta-tomcat-4.0 build.xml build.properties.sample
jfclere 02/05/08 09:43:03
Modified: . build.xml build.properties.sample
Log:
Add the download target. It helps to keep test environment up to date.
Revision Changes Path
1.67 +166 -0 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 25 Apr 2002 14:50:10 -0000 1.66
+++ build.xml 8 May 2002 16:43:03 -0000 1.67
@@ -443,5 +443,171 @@
<delete file="${tomcat.dist}/${jtc.final-src.name}.tar" />
</target>
+ <target name="download" depends="proxyflags">
+ <!-- Downdown any sub package or tools needed. -->
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-beanutils.loc}"/>
+ <param name="destfile" value="${commons-beanutils.jar}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-collections.loc}"/>
+ <param name="destfile" value="${commons-collections.jar}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-digester.loc}"/>
+ <param name="destfile" value="${commons-digester.jar}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-logging.loc}"/>
+ <param name="destfile" value="${commons-logging.jar}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${regexp.loc}"/>
+ <param name="destfile" value="${regexp.jar}"/>
+ </antcall>
+ <!-- Servlet api needs something different. -->
+
+ <antcall target="cvsbuild">
+ <param name="location" value="${servlet.loc}"/>
+ <param name="subdir" value="${servlet.home}"/>
+ <param name="destfile" value="${servlet.jar}"/>
+ </antcall>
+
+ <antcall target="downloadgz">
+ <!-- xerces2 brings 2 files, test for one of them -->
+ <param name="sourcefile" value="${xerces.loc}"/>
+ <param name="destfile" value="${xmlParserAPIs.jar}"/>
+ </antcall>
+ <!-- commons- daemons/dbcp/pool need something different. -->
+
+ <antcall target="cvsbuild">
+ <param name="location" value="${commons-daemon.loc}"/>
+ <param name="subdir" value="${commons-daemon.home}"/>
+ <param name="destfile" value="${commons-daemon.jar}"/>
+ </antcall>
+ <antcall target="cvsbuild">
+ <!-- Pool uses name to build the jar file -->
+ <param name="name" value="commons-pool"/>
+ <param name="location" value="${commons-pool.loc}"/>
+ <param name="subdir" value="${commons-pool.home}"/>
+ <param name="destfile" value="${commons-pool.jar}"/>
+ </antcall>
+ <!-- Pool does not put commons-pool.jar in ${commons-pool.home} -->
+ <copy
+ file="${commons-pool.home}/dist/commons-pool.jar"
+ tofile="${commons-pool.jar}"
+ />
+
+ <!-- commons-dbcp needs pool and ../LICENSE -->
+ <!-- That is ugly XXX needs a review -->
+ <copy file="LICENSE" tofile="../LICENSE"/>
+ <antcall target="cvsbuild">
+ <param name="location" value="${commons-dbcp.loc}"/>
+ <param name="subdir" value="${commons-dbcp.home}"/>
+ <param name="destfile" value="${commons-dbcp.jar}"/>
+ <param name="name" value="commons-dbcp"/>
+ </antcall>
+ <!-- Dbcp does not put commons-dbcp.jar in ${commons-dbcp.home} -->
+ <copy
+ file="${commons-dbcp.home}/dist/commons-dbcp.jar"
+ tofile="${commons-dbcp.jar}"
+ />
+
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-modeler.loc}"/>
+ <param name="destfile" value="${commons-modeler.jar}"/>
+ </antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${javaservice.loc}"/>
+ <param name="destfile" value="${javaservice.home}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${jmx.loc}"/>
+ <param name="destfile" value="${jmx.jar}"/>
+ </antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${junit.loc}"/>
+ <param name="destfile" value="${junit.jar}"/>
+ </antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${nsis.loc}"/>
+ <param name="destfile" value="${nsis.home}/nsis198.exe"/>
+ <param name="destdir" value="${nsis.home}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${struts.loc}"/>
+ <param name="destfile" value="${struts.jar}"/>
+ </antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${tyrex.loc}"/>
+ <param name="destfile" value="${tyrex.jar}"/>
+ <param name="destdir" value="${tyrex.home}"/>
+ </antcall>
+ </target>
+
+ <target name="proxyflags">
+ <!-- check proxy parameters. -->
+ <condition property="useproxy">
+ <equals arg1="${proxy.use}" arg2="on" />
+ </condition>
+ </target>
+
+ <target name="setproxy" if="useproxy">
+ <taskdef name="setproxy"
+ classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+ <target name="testexist">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+ <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+ <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+ <untar src="${base.path}/file.tar" dest="${base.path}"/>
+ <delete file="${base.path}/file.tar"/>
+ <delete file="${base.path}/file.tar.gz"/>
+ </target>
+
+ <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${base.path}/file.zip" />
+ <unzip src="${base.path}/file.zip" dest="${base.path}"/>
+ <delete file="${base.path}/file.zip"/>
+ </target>
+
+ <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+ <!-- Download extract the file -->
+ <mkdir dir="${destdir}" />
+ <get src="${sourcefile}" dest="${destfile}" />
+ </target>
+
+ <target name="cvsbuild" unless="exist" depends="testexist">
+ <!-- cvs checkout and ant dist + copy of jar file -->
+ <echo message="cvs co ${location} and ant dist in ${subdir}"/>
+ <mkdir dir="${base.path}/tmp"/>
+ <cvs cvsRoot="${cvsroot}"
+ package="${location}"
+ dest="${base.path}/tmp"
+ />
+ <!-- the software is checked out in ${{base.path}/tmp/${location} -->
+ <move todir="${subdir}">
+ <fileset dir="${base.path}/tmp/${location}/"/>
+ </move>
+ <!-- now build the distribution -->
+ <ant dir="${subdir}" target="dist"/>
+ </target>
+
+ <target name="jfc">
+ <antcall target="cvsbuild">
+ <param name="location" value="${commons-daemon.loc}"/>
+ <param name="subdir" value="${commons-daemon.home}"/>
+ <param name="destfile" value="${commons-daemon.jar}"/>
+ </antcall>
+ </target>
</project>
1.37 +27 -2 jakarta-tomcat-4.0/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.properties.sample,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.properties.sample 8 May 2002 05:40:39 -0000 1.36
+++ build.properties.sample 8 May 2002 16:43:03 -0000 1.37
@@ -6,7 +6,7 @@
# modules that Tomcat depends on. Copy this file to "build.properties"
# in the top-level source directory, and customize it as needed.
#
-# $Id: build.properties.sample,v 1.36 2002/05/08 05:40:39 remm Exp $
+# $Id: build.properties.sample,v 1.37 2002/05/08 16:43:03 jfclere Exp $
# -----------------------------------------------------------------------------
@@ -30,6 +30,14 @@
#Version number
version=4.1
+#Proxy to download subproject
+#proxy.host=proxy.domain
+#proxy.port=8080
+#proxy.use=on
+
+#CVS root for the jakarta subprojects that do not have released yet.
+cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
+
# ----- Default Base Path for Dependent Packages -----
base.path=/usr/local
@@ -52,24 +60,28 @@
commons-beanutils.home=${base.path}/commons-beanutils-1.3
commons-beanutils.lib=${commons-beanutils.home}
commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
+commons-beanutils.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils/v1.2/commons-beanutils-1.2.tar.gz
# ----- Commons Collections, version 1.0 or later -----
commons-collections.home=${base.path}/commons-collections-2.0
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections.jar
+commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.0/commons-collections-2.0-src.tar.gz
# ----- Commons Digester, version 1.1.1 or later -----
commons-digester.home=${base.path}/commons-digester-1.2
commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester.jar
+commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.2/commons-digester-1.2.tar.gz
# ----- Commons Logging, version 0.1 or later -----
commons-logging.home=${base.path}/commons-logging-1.0
commons-logging.lib=${commons-logging.home}
commons-logging.jar=${commons-logging.lib}/commons-logging.jar
+commons-logging.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0/commons-logging-1.0.tar.gz
# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
@@ -85,12 +97,14 @@
regexp.home=${base.path}/jakarta-regexp-1.2
regexp.lib=${regexp.home}
regexp.jar=${regexp.lib}/jakarta-regexp-1.2.jar
+regexp.loc=http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/jakarta-regexp-1.2.tar.gz
# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
servlet.home=${base.path}/jakarta-servletapi-4
servlet.lib=${servlet.home}/lib
servlet.jar=${servlet.lib}/servlet.jar
+servlet.loc=jakarta-servletapi-4
# ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----
@@ -104,6 +118,7 @@
# Note: Optional with JDK 1.4+, or if Xerces 1.x is present
xerces.home=${base.path}/xerces-2_0_1
xerces.lib=${xerces.home}
+xerces.loc=http://xml.apache.org/dist/xerces-j/Xerces-J-bin.2.0.1.tar.gz
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
@@ -123,28 +138,33 @@
commons-daemon.home=${base.path}/commons-daemon
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
+commons-daemon.loc=jakarta-commons-sandbox/daemon
# ----- Commons DBCP, version 20011030 or later -----
commons-dbcp.home=${base.path}/commons-dbcp
commons-dbcp.lib=${commons-dbcp.home}
commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
+commons-dbcp.loc=jakarta-commons/dbcp
# ----- Commons Modeler, version 1.0 or later -----
commons-modeler.home=${base.path}/commons-modeler-1.0
commons-modeler.lib=${commons-modeler.home}
commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
+commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
# ----- Commons Pool, version 1.0 or later -----
commons-pool.home=${base.path}/commons-pool-1.0
commons-pool.lib=${commons-pool.home}
commons-pool.jar=${commons-pool.lib}/commons-pool.jar
+commons-pool.loc=jakarta-commons/pool
# ----- JavaService, version 1.2.0 or later -----
javaservice.home=${base.path}/javaservice
+javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
@@ -154,9 +174,10 @@
# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.0 or later -----
-jmx.home=${base.path}/mx4j-1.0
+jmx.home=${base.path}/mx4j-1.0b3
jmx.lib=${jmx.home}/lib
jmx.jar=${jmx.lib}/mx4j.jar
+jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.0b3.tar.gz
# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
@@ -177,6 +198,7 @@
junit.home=${base.path}/junit3.7
junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
+junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
# ----- Java Mail, version 1.2 or later -----
@@ -187,17 +209,20 @@
# ----- NSIS, version 1.90 or later -----
nsis.home=${base.path}/nsis
+nsis.loc=http://www.nullsoft.com/free/nsis/nsis198.exe
# ----- Struts, version 1.0.1 or later -----
struts.home=${base.path}/jakarta-struts-1.0.2
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
+struts.loc=http://jakarta.apache.org/builds/jakarta-struts/release/v1.0.2/jakarta-struts-1.0.2.tar.gz
# ----- Tyrex Data Source, version 0.9.7 -----
tyrex.home=${base.path}/tyrex-0.9.7.0
tyrex.lib=${tyrex.home}
tyrex.jar=${tyrex.lib}/tyrex-0.9.7.0.jar
+tyrex.loc=ftp://ftp.exolab.org/pub/tyrex/tyrex-0.9.7.0/tyrex-0.9.7.0.jar
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>