costin 2002/10/14 16:09:44
Modified: . build.xml
Log:
Added a target that will only build, with minimal copy. It can be
used for develoment ( when you modify a file and want a quick build
to see the result ).
If you have a super-fast computer, just use the normal target :-)
Also added a target to update all source repositories that we
use.
Note that the target won't work unless the servlet patch is
applied ( that shouldn't affect existing targets ).
Revision Changes Path
1.44 +129 -3 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 14 Oct 2002 09:25:08 -0000 1.43
+++ build.xml 14 Oct 2002 23:09:44 -0000 1.44
@@ -48,6 +48,10 @@
<property name="webapps.build" value="${catalina.home}/webapps/build"/>
<property name="webapps.dist" value="${catalina.home}/webapps/dist"/>
+ <!-- Some compilers will disable debugging if true. And it doesn't do anything
+ in most cases -->
+ <property name="compile.optimize" value="false"/>
+
<!-- =================== DETECT: Display configuration ================== -->
<target name="detect"
@@ -65,18 +69,113 @@
<!-- ===================== DEPLOY: Create Directories =================== -->
- <target name="deploy-prepare">
+ <target name="init">
<mkdir dir="${tomcat.build}"/>
+ <mkdir dir="${tomcat.build}/classes" />
+
+ <uptodate property="servletapi.build.notrequired"
+ targetfile="${tomcat.build}/common/lib/servlet-api.jar">
+ <srcfiles dir="${api.home}/jsr154/src" includes="**" />
+ </uptodate>
+ <uptodate property="jspapi.build.notrequired"
+ targetfile="${tomcat.build}/common/lib/jsp-api.jar">
+ <srcfiles dir="${api.home}/jsr152/src" includes="**" />
+ </uptodate>
+
+ <uptodate property="tomcatutil.build.notrequired"
+ targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
+ <srcfiles dir="${jtc.home}/util/java" includes="**" />
+ </uptodate>
+
</target>
<!-- ====================== DEPLOY: Copy Static Files =================== -->
- <target name="deploy-static" depends="deploy-prepare"/>
+ <target name="deploy-static" depends="init"/>
+
+
+ <!-- ====================== Build all components =================== -->
+ <target name="build-servletapi" unless="servletapi.build.notrequired" >
+ <echo>========== Building: ${servlet-api.jar}</echo>
+
+ <ant dir="${api.home}/jsr154" target="jar" >
+ <property name="servlet-api.build" value="${tomcat.build}" />
+ <property name="servlet-api.jar"
value="${tomcat.build}/common/lib/servlet-api.jar"/>
+ </ant>
+ </target>
+
+ <target name="build-jspapi" unless="jspapi.build.notrequired" >
+ <echo>========== Building: ${jsp-api.jar}</echo>
+ <ant dir="${api.home}/jsr152" target="jar">
+ <property name="jsp-api.build" value="${tomcat.build}" />
+ <property name="jsp-api.jar"
value="${tomcat.build}/common/lib/jsp-api.jar"/>
+ </ant>
+ </target>
+
+ <target name="build-tomcatutil" unless="tomcatutil.build.notrequired" >
+ <echo>========== Building: tomcat-util </echo>
+
+ <ant dir="${jtc.home}/util" target="build-main">
+ <property name="jmx.jar" value="${jmx.jar}" />
+ <property name="puretls.jar" value="${puretls.jar}" />
+ <property name="jsse.lib" value="${jsse.lib}" />
+
+ <property name="tomcat-util.build" value="${tomcat.build}" />
+ <property name="tomcat-util.lib" value="${tomcat.build}/server/lib" />
+ </ant>
+ </target>
+
+ <target name="build" depends="init,build-servletapi,build-jspapi,build-tomcatutil"
+ description="Builds all components">
+
+ <echo>========== Building: catalina </echo>
+
+ <ant dir="${catalina.home}/catalina" target="catalina-jars">
+ <!-- in-place building -->
+ <property name="catalina.build" value="${tomcat.build}" />
+ <property name="catalina.deploy" value="${tomcat.build}" />
+ <property name="flags.hide" value="true" />
+ </ant>
+
+ <echo>========== Building: tomcat-coyote </echo>
+
+ <ant dir="${jtc.home}/coyote" target="compile.tomcat5">
+ <property name="catalina.home" value="${tomcat.build}"/>
+ <property name="tomcat5.detect" value="true"/>
+ <property name="servlet.jar" value="${servlet-api.jar}"/>
+ </ant>
+ <echo>========== Building: tomcat-jk </echo>
+
+ <ant dir="${jtc.home}/jk" target="build-main">
+ <property name="tomcat41.home" value="${tomcat.build}"/>
+ <property name="catalina.home" value="${tomcat.build}"/>
+ <property name="commons-logging.jar" value="${commons-logging.jar}"/>
+ <property name="jmx.jar" value="${jmx.jar}"/>
+ </ant>
+
+ <echo>========== Building: tomcat-httpd </echo>
+
+ <ant dir="${jtc.home}/http11" target="compile">
+ <property name="commons-logging.jar" value="${commons-logging.jar}"/>
+ </ant>
+
+ <echo>========== Building: jasper </echo>
+
+ <ant dir="${jasper.home}" target="deploy">
+ <property name="catalina.home" value="${tomcat.build}"/>
+ </ant>
+
+ <!-- Correct permissions and line endings on "bin" scripts -->
+ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/>
+ <chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
+
+ </target>
<!-- ====================== DEPLOY: Deploy Components =================== -->
<target name="deploy" depends="deploy-static"
- description="Build and deploy all components">
+ description="Build and deploy all components">
<echo>Target: Servlet API - Dist ...</echo>
<ant dir="${api.home}/jsr154" target="dist"/>
@@ -601,6 +700,8 @@
<delete file="${tomcat.dist}/${final-src.name}.tar" />
</target>
+ <!-- ==================== Download or build the required binary packages
==================== -->
+
<target name="download" depends="proxyflags">
<!-- commons-digester needs ../LICENSE -->
@@ -778,6 +879,31 @@
<!-- now build the distribution -->
<ant dir="${subdir}" target="dist"/>
</target>
+
+ <target name="update" depends="checkout" />
+
+ <target name="checkout"
+ description="Update or checkout required sources from CVS">
+ <cvs cvsroot="${cvsroot}" quiet="true"
+ command="checkout -P jakarta-tomcat-catalina"
+ dest=".."/>
+ <cvs cvsroot="${cvsroot}" quiet="true"
+ command="checkout -P jakarta-tomcat-jasper"
+ dest=".."/>
+ <cvs cvsroot="${cvsroot}" quiet="true"
+ command="checkout -P jakarta-commons"
+ dest=".."/>
+ <cvs cvsroot="${cvsroot}" quiet="true"
+ command="checkout -P jakarta-tomcat-connectors"
+ dest=".."/>
+ <cvs cvsroot="${cvsroot}" quiet="true"
+ command="checkout -P jakarta-servletapi-5"
+ dest=".."/>
+ <cvs cvsroot="${cvsroot}" quiet="true"
+ command="checkout -P jakarta-taglibs"
+ dest=".."/>
+ </target>
+
<target name="jfc">
<antcall target="cvsbuild">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
