remm 2003/01/17 09:05:34
Modified: . build.xml
Log:
- Revert to revision 1.62 of the build script.
Revision Changes Path
1.64 +26 -112 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- build.xml 16 Jan 2003 23:14:02 -0000 1.63
+++ build.xml 17 Jan 2003 17:05:34 -0000 1.64
@@ -5,7 +5,6 @@
<!-- See "build.properties.sample" in the top level directory for all -->
<!-- property values you must customize for successful building!!! -->
- <property file="${user.home}/.tomcat5.build.properties"/>
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
<property file="build.properties.default"/>
@@ -66,10 +65,9 @@
<echo message="catalina.home=${catalina.home}"/>
<echo message="jasper.home=${jasper.home}"/>
<echo message="jtc.home=${jtc.home}"/>
-
- <!--
+
<ant dir="${catalina.home}" target="flags.display"/>
- -->
+
</target>
@@ -92,17 +90,17 @@
<srcfiles dir="${jtc.home}/util/java" includes="**" />
</uptodate>
- <uptodate property="tomcat-jk.build.notrequired"
+ <uptodate property="tomcatjk.build.notrequired"
targetfile="${tomcat.build}/server/lib/tomcat-jk2.jar">
<srcfiles dir="${jtc.home}/jk/java" includes="**" />
</uptodate>
- <uptodate property="tomcat-coyote.build.notrequired"
+ <uptodate property="tomcatcoyote.build.notrequired"
targetfile="${tomcat.build}/server/lib/tomcat-coyote.jar">
<srcfiles dir="${jtc.home}/coyote/src" includes="**" />
</uptodate>
- <uptodate property="tomcat-http11.build.notrequired"
+ <uptodate property="tomcathttp11.build.notrequired"
targetfile="${tomcat.build}/server/lib/tomcat-http11.jar">
<srcfiles dir="${jtc.home}/http11/src" includes="**" />
</uptodate>
@@ -150,14 +148,12 @@
</ant>
</target>
- <target name="build-tomcat-jk" unless="tomcat-jk.build.notrequired" >
+ <target name="build-tomcatjk" unless="tomcatjk.build.notrequired" >
<echo>========== Building: tomcat-jk </echo>
- <ant dir="${jtc.home}/jk" target="jkjava">
+ <ant dir="${jtc.home}/jk" target="build-main">
<property name="tomcat5.home" value="${catalina.build}"/>
- <property name="tomcat5.detect" value="true"/>
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
- <property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar"/>
<property name="jmx.jar" value="${jmx.jar}"/>
<property name="jk.build" value="${tomcat.build}"/>
@@ -171,95 +167,39 @@
</ant>
</target>
- <target name="build-tomcat-coyote"
- unless="tomcat-coyote.build.notrequired"
+ <target name="build-tomcatcoyote"
+ unless="tomcatcoyote.build.notrequired"
depends="init">
<echo>========== Building: tomcat-coyote </echo>
- <ant dir="${jtc.home}/coyote" target="jar.tomcat5">
+ <ant dir="${jtc.home}/coyote" target="compile.tomcat5">
<property name="catalina.home" value="${tomcat.build}"/>
- <property name="build.home" value="${tomcat.build}"/>
<property name="tomcat5.detect" value="true"/>
- <property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar"/>
<property name="servlet.jar"
value="${tomcat.build}/common/lib/servlet-api.jar"/>
</ant>
</target>
- <target name="build-tomcat-http11"
- unless="tomcat-http11.build.notrequired"
+ <target name="build-tomcathttp11"
+ unless="tomcathttp11.build.notrequired"
depends="init">
<echo>========== Building: tomcat-http11 </echo>
- <ant dir="${jtc.home}/http11" target="compile-only">
+ <ant dir="${jtc.home}/http11" target="compile">
<property name="build.home" value="${tomcat.build}"/>
<property name="tomcat-http11.jar"
value="${tomcat.build}/server/lib/tomcat-http11.jar"/>
- <property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar"/>
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
- <property name="commons-modeler.jar"
value="${tomcat.build}/server/lib/commons-modeler.jar"/>
</ant>
</target>
- <target name="build-admin"
- depends="init" description="Builds the admin webapp" >
- <echo>========== Building: admin to ${tomcat.build}/server/webapps </echo>
+ <target name="build-admin" unless="admin.build.notrequired"
+ depends="init" >
+ <echo>========== Building: admin </echo>
<ant dir="${catalina.home}/webapps/admin" target="build-main">
- <property name="flags.hide" value="true" />
+ <!-- property name="flags.hide" value="true" / -->
<property name="webapps.build" value="${tomcat.build}/server/webapps"/>
</ant>
- <!-- JSPC -->
- <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-
- <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-
- <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
- <classpath id="jspc.classpath">
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${build.dir}/classes"/>
- </classpath>
- </taskdef>
-
- <jasper2 verbose="0"
- package="admin"
- compile="false"
- validateXml="false"
- uriroot="${admin.base}"
- webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
- outputDir="${admin.base}/WEB-INF/src/admin" />
-
- <loadfile property="generated_web.xml"
- srcFile="${admin.base}/WEB-INF/generated_web.xml" />
-
- <replace file="${admin.base}/WEB-INF/web.xml"
- token="<!--GENERATED_JSPS-->" value="${generated_web.xml}" />
-
- <javac destdir="${admin.base}/WEB-INF/classes"
- optimize="off"
- debug="on"
- srcdir="${admin.base}/WEB-INF/src" >
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${admin.base}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- </classpath>
- <include name="admin/**" />
- </javac>
-
-
+ <touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" />
</target>
<target name="build" depends="init"
@@ -271,21 +211,18 @@
<echo>========== Building: catalina </echo>
- <ant dir="${catalina.home}/catalina" target="catalina-jars" >
- <!--
- <property name="flags.hide" value="true" />
- -->
- <property name="classes.dir" value="${tomcat.build}/classes" />
+ <ant dir="${catalina.home}/catalina" target="catalina-jars">
+ <!-- in-place building -->
<property name="catalina.build" value="${tomcat.build}" />
- <property name="commons-modeler.jar" value="${commons-modeler.jar}" />
<property name="catalina.deploy" value="${tomcat.build}" />
+ <property name="flags.hide" value="true" />
</ant>
- <antcall target="build-tomcat-coyote"/>
+ <antcall target="build-tomcatcoyote"/>
- <antcall target="build-tomcat-jk"/>
+ <antcall target="build-tomcatjk"/>
- <antcall target="build-tomcat-http11"/>
+ <antcall target="build-tomcathttp11"/>
<echo>========== Building: jasper </echo>
@@ -314,7 +251,7 @@
<target name="build-commons-modeler" unless="commons-modeler.build.notrequired" >
<echo>========== Building: commons-modeler </echo>
- <ant dir="${cvs.base}/jakarta-commons/modeler" target="jar" >
+ <ant dir="${cvs.base}/jakarta-commons/modeler" target="compile-only" >
<property name="commons-logging.jar"
location="${tomcat.build}/server/lib/commons-logging.jar" />
<property name="commons-modeler.jar"
location="${tomcat.build}/server/lib/commons-modeler.jar" />
<property name="build.home" value="${tomcat.build}" />
@@ -342,11 +279,7 @@
<ant dir="${api.home}/jsr152" target="dist"/>
<echo>Target: Catalina - Deploy ...</echo>
- <ant dir="${catalina.home}" target="deploy-catalina"/>
- <antcall target="build-tomcat-coyote"/>
- <antcall target="build-tomcat-jk"/>
- <antcall target="build-tomcat-http11"/>
-
+ <ant dir="${catalina.home}" target="deploy"/>
<copy todir="${tomcat.build}">
<fileset dir="${catalina.home}/build"/>
</copy>
@@ -1057,9 +990,6 @@
<cvs cvsroot="${cvsroot}" quiet="true"
command="checkout -P jakarta-servletapi-5"
dest=".."/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P jakarta-commons"
- dest=".."/>
</target>
@@ -1070,21 +1000,5 @@
<param name="destfile" value="${commons-daemon.jar}"/>
</antcall>
</target>
-
- <!-- ==================== Modeler tricks ====================
- -->
- <target name="convert-mbeans" description="Hack: regenerate the ser form of the
descriptors">
- <path id="tomcatCP" >
- <fileset dir="${tomcat.build}/common/lib" includes="*.jar"/>
- <fileset dir="${tomcat.build}/server/lib" includes="*.jar" />
- </path>
- <taskdef resource="org/apache/commons/modeler/ant/ant.properties"
- classpathref="tomcatCP" />
-
- <mbeans-descriptors
file="${catalina.home}/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml"
-
out="build/classes/org/apache/catalina/mbeans/mbeans-descriptors.xml.ser" />
- </target>
-
-
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
