remm 2002/10/26 07:23:12
Modified: . build.properties.default build.xml
Log:
- Update to new versions.
- Remove Watchdog from download target. It takes an insane amount of time
to complete, and is mostly not needed. IMO, it should be moved to a different
"download-watchdog" target or something.
- Optimize release targets using new Ant features. This should help my poor
laptop HD last a bit longer.
Revision Changes Path
1.47 +4 -4 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.properties.default 24 Oct 2002 11:48:51 -0000 1.46
+++ build.properties.default 26 Oct 2002 14:23:12 -0000 1.47
@@ -59,13 +59,13 @@
commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.1/commons-collections-2.1.tar.gz
-# ----- Commons Launcher, version 20021012 or later -----
-commons-launcher.home=${base.path}/commons-launcher
+# ----- Commons Launcher, version 0.9 or later -----
+commons-launcher.home=${base.path}/commons-launcher-0.9
commons-launcher.lib=${commons-launcher.home}
commons-launcher.bin=${commons-launcher.home}/bin
commons-launcher.jar=${commons-launcher.bin}/commons-launcher.jar
commons-launcher.bootstrap.class=${commons-launcher.bin}/LauncherBootstrap.class
-commons-launcher.loc=jakarta-commons-sandbox/launcher
+commons-launcher.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-launcher/v0.9/commons-launcher-0.9.tar.gz
# ----- Commons Digester, version 20020820 or later -----
1.49 +59 -110 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build.xml 18 Oct 2002 20:47:59 -0000 1.48
+++ build.xml 26 Oct 2002 14:23:12 -0000 1.49
@@ -573,34 +573,14 @@
<arg value="tomcat.nsi" />
</exec>
<move file="${tomcat.dist}/tomcat-installer.exe"
- tofile="${tomcat.dist}/${final.name}.exe" />
+ tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
</target>
<!-- ==================== RELEASE: Create Release ======================= -->
- <target name="release"
depends="prepare-release,clean,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz"
+ <target name="release"
depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-src-zip,package-src-tgz"
description="Create a Tomcat 5 packaged distribution">
- <mkdir dir="${tomcat.release}"/>
- <mkdir dir="${tomcat.release}/v${version}"/>
- <mkdir dir="${tomcat.release}/v${version}/bin"/>
- <mkdir dir="${tomcat.release}/v${version}/src"/>
-
- <copy file="${tomcat.dist}/${final.name}.exe"
- todir="${tomcat.release}/v${version}/bin"
- failonerror="false"/>
- <delete file="${tomcat.dist}/${final.name}.exe"
- failonerror="false"/>
- <move file="${tomcat.dist}/${final.name}.tar.gz"
- todir="${tomcat.release}/v${version}/bin"/>
- <move file="${tomcat.dist}/${final.name}.zip"
- todir="${tomcat.release}/v${version}/bin"/>
-
- <move file="${tomcat.dist}/${final-src.name}.tar.gz"
- todir="${tomcat.release}/v${version}/src"/>
- <move file="${tomcat.dist}/${final-src.name}.zip"
- todir="${tomcat.release}/v${version}/src"/>
-
<filter token="VERSION" value="${version}"/>
<copy file="KEYS"
todir="${tomcat.release}/v${version}"/>
@@ -616,10 +596,11 @@
<copy file="resources/welcome.bin.html"
tofile="${tomcat.release}/v${version}/bin/README.html"
filtering="true"/>
+
</target>
<target name="package-zip">
- <zip zipfile="${tomcat.dist}/${final.name}.zip">
+ <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
<zipfileset dir="${tomcat.dist}" prefix="${final.name}"
includes="bin/**" />
<zipfileset dir="${tomcat.dist}" prefix="${final.name}"
@@ -654,6 +635,12 @@
</target>
<target name="prepare-release">
+
+ <mkdir dir="${tomcat.release}"/>
+ <mkdir dir="${tomcat.release}/v${version}"/>
+ <mkdir dir="${tomcat.release}/v${version}/bin"/>
+ <mkdir dir="${tomcat.release}/v${version}/src"/>
+
<condition property="execute.installer">
<and>
<os family="windows" />
@@ -662,103 +649,72 @@
<available file="${nsis.installoptions.dll}" />
</and>
</condition>
+
</target>
<target name="package-tgz">
- <mkdir dir="${tomcat.dist}/${final.name}" />
- <copy todir="${tomcat.dist}/${final.name}">
- <fileset dir="${tomcat.dist}">
- <include name="bin/**" />
- <include name="common/**" />
- <include name="conf/**" />
- <include name="logs/**" />
- <include name="server/**" />
- <include name="shared/**" />
- <include name="webapps/**" />
- <include name="work/**" />
- <include name="temp/**" />
- <include name="LICENSE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- <include name="CHANGELOG" />
- <include name="RUNNING.txt" />
- <include name="BENCHMARKS.txt" />
- </fileset>
- </copy>
- <fixcrlf srcdir="${tomcat.dist}/${final.name}"
+ <fixcrlf srcdir="${tomcat.dist}"
includes="*.txt,LICENSE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/${final.name}/conf" eol="lf"/>
- <tar longfile="gnu" tarfile="${tomcat.dist}/${final.name}.tar">
- <tarfileset dir="${tomcat.dist}" mode="755">
- <include name="${final.name}/bin/catalina.sh" />
- <include name="${final.name}/bin/digest.sh" />
- <include name="${final.name}/bin/jasper.sh" />
- <include name="${final.name}/bin/jspc.sh" />
- <include name="${final.name}/bin/setclasspath.sh" />
- <include name="${final.name}/bin/startup.sh" />
- <include name="${final.name}/bin/shutdown.sh" />
- <include name="${final.name}/bin/tool-wrapper.sh" />
+ <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
+ <tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}">
+ <include name="bin/catalina.sh" />
+ <include name="bin/digest.sh" />
+ <include name="bin/jasper.sh" />
+ <include name="bin/jspc.sh" />
+ <include name="bin/setclasspath.sh" />
+ <include name="bin/startup.sh" />
+ <include name="bin/shutdown.sh" />
+ <include name="bin/tool-wrapper.sh" />
</tarfileset>
- <tarfileset dir="${tomcat.dist}">
- <include name="${final.name}/**" />
- <exclude name="${final.name}/bin/catalina.sh" />
- <exclude name="${final.name}/bin/digest.sh" />
- <exclude name="${final.name}/bin/jasper.sh" />
- <exclude name="${final.name}/bin/jspc.sh" />
- <exclude name="${final.name}/bin/setclasspath.sh" />
- <exclude name="${final.name}/bin/startup.sh" />
- <exclude name="${final.name}/bin/shutdown.sh" />
- <exclude name="${final.name}/bin/tool-wrapper.sh" />
+ <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
+ <exclude name="bin/catalina.sh" />
+ <exclude name="bin/digest.sh" />
+ <exclude name="bin/jasper.sh" />
+ <exclude name="bin/jspc.sh" />
+ <exclude name="bin/setclasspath.sh" />
+ <exclude name="bin/startup.sh" />
+ <exclude name="bin/shutdown.sh" />
+ <exclude name="bin/tool-wrapper.sh" />
+ <exclude name="src/**" />
</tarfileset>
</tar>
- <delete dir="${tomcat.dist}/${final.name}" />
- <gzip zipfile="${tomcat.dist}/${final.name}.tar.gz"
- src="${tomcat.dist}/${final.name}.tar"/>
- <delete file="${tomcat.dist}/${final.name}.tar" />
</target>
<target name="package-src-zip">
<!-- Package Tomcat Source -->
- <zip zipfile="${tomcat.dist}/${final-src.name}.zip">
+ <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
<zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
</zip>
</target>
<target name="package-src-tgz">
<!-- Package Tomcat Source -->
- <mkdir dir="${tomcat.dist}/${final-src.name}" />
- <copy todir="${tomcat.dist}/${final-src.name}">
- <fileset dir="${tomcat.dist}/src">
- <include name="**" />
- </fileset>
- </copy>
- <fixcrlf srcdir="${tomcat.dist}/${final-src.name}"
+ <fixcrlf srcdir="${tomcat.dist}"
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico" eol="lf"/>
- <tar longfile="gnu" tarfile="${tomcat.dist}/${final-src.name}.tar">
- <tarfileset dir="${tomcat.dist}" mode="755">
- <include name="${final-src.name}/${jtc.project}/jk/native/buildconf.sh" />
- <include
name="${final-src.name}/${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" />
- <include
name="${final-src.name}/${jtc.project}/jk/native/apache-1.3/build-solaris.sh" />
- <include
name="${final-src.name}/${jtc.project}/jk/native/apache-1.3/build-unix.sh" />
- <include
name="${final-src.name}/${jtc.project}/jk/native/apache-2.0/build-unix.sh" />
- <include
name="${final-src.name}/${jtc.project}/jk/native/apache-2.0/install-unix.sh" />
- <include name="${final-src.name}/${jtc.project}/jk/native/domino/mkini.sh"
/>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
+ <tarfileset dir="${tomcat.dist}" mode="755" prefix="${final-src.name}">
+ <include name="${jtc.project}/jk/native/buildconf.sh" />
+ <include name="${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" />
+ <include name="${jtc.project}/jk/native/apache-1.3/build-solaris.sh" />
+ <include name="${jtc.project}/jk/native/apache-1.3/build-unix.sh" />
+ <include name="${jtc.project}/jk/native/apache-2.0/build-unix.sh" />
+ <include name="${jtc.project}/jk/native/apache-2.0/install-unix.sh" />
+ <include name="${jtc.project}/jk/native/domino/mkini.sh" />
</tarfileset>
- <tarfileset dir="${tomcat.dist}">
- <include name="${final-src.name}/**" />
- <exclude name="${final-src.name}/${jtc.project}/jk/native/buildconf.sh" />
- <exclude
name="${final-src.name}/${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" />
- <exclude
name="${final-src.name}/${jtc.project}/jk/native/apache-1.3/build-solaris.sh" />
- <exclude
name="${final-src.name}/${jtc.project}/jk/native/apache-1.3/build-unix.sh" />
- <exclude
name="${final-src.name}/${jtc.project}/jk/native/apache-2.0/build-unix.sh" />
- <exclude
name="${final-src.name}/${jtc.project}/jk/native/apache-2.0/install-unix.sh" />
- <exclude name="${final-src.name}/${jtc.project}/jk/native/domino/mkini.sh"
/>
+ <tarfileset dir="${tomcat.dist}" prefix="${final-src.name}">
+ <include name="src/**" />
+ <exclude name="${jtc.project}/jk/native/buildconf.sh" />
+ <exclude name="${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" />
+ <exclude name="${jtc.project}/jk/native/apache-1.3/build-solaris.sh" />
+ <exclude name="${jtc.project}/jk/native/apache-1.3/build-unix.sh" />
+ <exclude name="${jtc.project}/jk/native/apache-2.0/build-unix.sh" />
+ <exclude name="${jtc.project}/jk/native/apache-2.0/install-unix.sh" />
+ <exclude name="${jtc.project}/jk/native/domino/mkini.sh" />
</tarfileset>
</tar>
- <delete dir="${tomcat.dist}/${final-src.name}" />
- <gzip zipfile="${tomcat.dist}/${final-src.name}.tar.gz"
- src="${tomcat.dist}/${final-src.name}.tar"/>
- <delete file="${tomcat.dist}/${final-src.name}.tar" />
</target>
<!-- ==================== Download or build the required binary packages
==================== -->
@@ -813,19 +769,10 @@
<param name="destfile" value="${xmlParserAPIs.jar}"/>
</antcall>
- <antcall target="cvsbuild">
- <param name="location" value="${commons-launcher.loc}"/>
- <param name="subdir" value="${commons-launcher.home}"/>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-launcher.loc}"/>
<param name="destfile" value="${commons-launcher.jar}"/>
</antcall>
- <copy
- file="${commons-launcher.home}/dist/bin/commons-launcher.jar"
- tofile="${commons-launcher.jar}"
- />
- <copy
- file="${commons-launcher.home}/dist/bin/LauncherBootstrap.class"
- tofile="${commons-launcher.bootstrap.class}"
- />
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool.loc}"/>
@@ -870,6 +817,7 @@
<param name="destfile" value="${tyrex.jar}"/>
<param name="destdir" value="${tyrex.home}"/>
</antcall>
+<!--
<antcall target="cvsbuild">
<param name="location" value="${servlet23api.loc}"/>
<param name="subdir" value="${servlet23api.home}"/>
@@ -881,6 +829,7 @@
<param name="subdir" value="${watchdog.home}"/>
<param name="destfile" value="${watchdog.war}"/>
</antcall>
+-->
</target>
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
