patrickl 2002/07/30 15:13:49 Modified: . BUILDING.txt build.properties.default build.xml Log: Have download target checkout jakarta-commons-sandbox/daemon and jakarta-commons/digester since the lastest nightly build is going to be required to get pending Launcher changes and XML schema support. Revision Changes Path 1.4 +4 -4 jakarta-tomcat-5/BUILDING.txt Index: BUILDING.txt =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/BUILDING.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BUILDING.txt 30 Jul 2002 20:01:32 -0000 1.3 +++ BUILDING.txt 30 Jul 2002 22:13:49 -0000 1.4 @@ -201,15 +201,15 @@ (8) Download and Install the Commons Digester Binary Distribution -* Download a binary distribution of Version 1.2 or later from: +* Download a binary distribution (nightly build 20020731 or later) from: http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester On a Windows platform, you will need: - commons-digester-X.Y.zip + commons-digester-YYYYMMDD.zip On a Unix platform, you will need: - commons-digester-X.Y.tar.gz + commons-digester-YYYYMMDD.tar.gz * Unpack the binary distribution into a convenient location so that the distribution resides in its own directory. 1.9 +4 -11 jakarta-tomcat-5/build.properties.default Index: build.properties.default =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- build.properties.default 30 Jul 2002 21:00:33 -0000 1.8 +++ build.properties.default 30 Jul 2002 22:13:49 -0000 1.9 @@ -71,11 +71,11 @@ commons-daemon.loc=jakarta-commons-sandbox/daemon -# ----- Commons Digester, version 1.2 or later ----- -commons-digester.home=${base.path}/commons-digester-1.2 +# ----- Commons Digester, version 20020731 or later ----- +commons-digester.home=${base.path}/commons-digester 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-digester.loc=jakarta-commons/digester # ----- Commons Logging, version 20020728 or later ----- @@ -109,13 +109,6 @@ xercesImpl.jar=${xerces.lib}/xercesImpl.jar xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar xerces.loc=http://xml.apache.org/dist/xerces-j/Xerces-J-bin.2.0.2.tar.gz - - -# ----- JSTL 1.0 ----- -jstl.home=${base.path}/jakarta-taglibs/jstl-1.0 -jstl.lib=${jstl.home}/lib -jstl.jar=${jstl.lib}/jstl.jar -jstl-impl.jar=${jstl.lib}/standard.jar # -------------------------------------------------- 1.12 +29 -5 jakarta-tomcat-5/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- build.xml 30 Jul 2002 21:00:33 -0000 1.11 +++ build.xml 30 Jul 2002 22:13:49 -0000 1.12 @@ -240,6 +240,10 @@ <exclude name="build.properties"/> </fileset> </copy> + <mkdir dir="${tomcat.dist}/src/catalina"/> + <copy todir="${tomcat.dist}/src/catalina"> + <fileset dir="${catalina.home}"/> + </copy> <mkdir dir="${tomcat.dist}/src/jasper"/> <copy todir="${tomcat.dist}/src/jasper"> <fileset dir="${jasper.home}"/> @@ -461,6 +465,11 @@ </target> <target name="download" depends="proxyflags"> + + <!-- commons-logging/dbcp/pool need ../LICENSE --> + <!-- That is ugly XXX needs a review --> + <copy file="LICENSE" tofile="../LICENSE"/> + <!-- Downdown any sub package or tools needed. --> <antcall target="downloadgz"> <param name="sourcefile" value="${commons-beanutils.loc}"/> @@ -470,10 +479,16 @@ <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}"/> + + <antcall target="cvsbuild"> + <param name="location" value="${commons-digester.loc}"/> + <param name="subdir" value="${commons-digester.home}"/> <param name="destfile" value="${commons-digester.jar}"/> </antcall> + <copy + file="${commons-digester.home}/dist/commons-digester.jar" + tofile="${commons-digester.jar}" + /> <!-- we need the release to happend, in the meantime use cvs... <antcall target="downloadgz"> @@ -482,9 +497,6 @@ </antcall> --> - <!-- commons-logging/dbcp/pool need ../LICENSE --> - <!-- That is ugly XXX needs a review --> - <copy file="LICENSE" tofile="../LICENSE"/> <antcall target="cvsbuild"> <param name="location" value="${commons-logging.loc}"/> <param name="subdir" value="${commons-logging.home}"/> @@ -515,6 +527,18 @@ <param name="subdir" value="${commons-daemon.home}"/> <param name="destfile" value="${commons-daemon.jar}"/> </antcall> + <copy + file="${commons-daemon.home}/dist/commons-daemon.jar" + tofile="${commons-daemon.jar}" + /> + <copy + file="${commons-daemon.home}/dist/bin/commons-launcher.jar" + tofile="${commons-daemon-launcher.jar}" + /> + <copy + file="${commons-daemon.home}/dist/bin/LauncherBootstrap.class" + tofile="${commons-daemon-launcher-bootstrap.class}" + /> <!-- commons-dbcp/pool need something different. --> <!-- Pool 1.0 -->
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>