Return-Path: 
 <tomcat-dev-return-20164-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 80841 invoked from network); 15 Oct 2002 20:47:06 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 15 Oct 2002 20:47:06 -0000
Received: (qmail 27680 invoked by uid 97); 15 Oct 2002 20:46:08 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 27555 invoked by uid 97); 15 Oct 2002 20:46:04 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 27425 invoked by uid 97); 15 Oct 2002 20:46:00 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 15 Oct 2002 20:44:59 -0000
Message-ID: <20021015204459.15780.qmail@icarus.apache.org>
From: costin@apache.org
To: jakarta-tomcat-5-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-5 build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

costin      2002/10/15 13:44:59

  Modified:    .        build.xml
  Log:
  More 'fast-build' targets.
  
  I intend to remove the compilation part of build2.xml, and move
  the rest in other places ( ant-launcher.xml ? ). While it's very
  fast, it is also too hard to maintain.
  
  The current solution is a bit slower, but it uses the original
  build.xml files for each component.
  
  What I'm doing is simply call the build.xml with the build
  dir and .jar target pointing to our build and the final destination.
  That avoids file copy.
  In addition it uses <uptodate> to avoid recompiling what doesn't
  change.
  
  After a full build, I get a second one in ~10-15 sec, and then it
  seems to work fine and compile only what changed.
  It is also possible to call individual targets.
  
  That's for people with <2GHz processors only :-)
  
  Revision  Changes    Path
  1.45      +59 -16    jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- build.xml	14 Oct 2002 23:09:44 -0000	1.44
  +++ build.xml	15 Oct 2002 20:44:59 -0000	1.45
  @@ -87,6 +87,21 @@
         <srcfiles dir="${jtc.home}/util/java" includes="**" />
       </uptodate>
   
  +    <uptodate property="tomcatjk.build.notrequired"
  +              targetfile="${tomcat.build}/server/lib/tomcat-jk2.jar">
  +      <srcfiles dir="${jtc.home}/jk/java" includes="**" />
  +    </uptodate>
  +
  +    <uptodate property="tomcatcoyote.build.notrequired"
  +              targetfile="${tomcat.build}/server/lib/tomcat-coyote.jar">
  +      <srcfiles dir="${jtc.home}/coyote/src" includes="**" />
  +    </uptodate>
  +
  +    <uptodate property="admin.build.notrequired" 
  +              targetfile="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml">
  +      <srcfiles dir="${catalina.home}/webapps/admin" includes="**" />
  +    </uptodate>
  +
     </target>
   
   
  @@ -125,18 +140,20 @@
       </ant>
     </target>
   
  -  <target name="build" depends="init,build-servletapi,build-jspapi,build-tomcatutil"
  -          description="Builds all components">
  -
  -    <echo>========== Building: catalina </echo>
  +  <target name="build-tomcatjk" unless="tomcatjk.build.notrequired" >
  +    <echo>========== Building: tomcat-jk </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 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>
  +  </target>
   
  +  <target name="build-tomcatcoyote" 
  +          unless="tomcatcoyote.build.notrequired" 
  +          depends="init">
       <echo>========== Building: tomcat-coyote </echo>
   
       <ant dir="${jtc.home}/coyote" target="compile.tomcat5">
  @@ -144,16 +161,41 @@
         <property name="tomcat5.detect" value="true"/>
         <property name="servlet.jar"   value="${servlet-api.jar}"/>
       </ant>
  +  </target>
   
  -    <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}"/>
  +  <target name="build-admin" unless="admin.build.notrequired" 
  +          depends="init" >
  +    <echo>========== Building: admin ( ${admin.build.notrequired} ) </echo>
  +    <ant dir="${catalina.home}/webapps/admin" target="build-main">
  +      <!-- property name="flags.hide" value="true" / -->
  +      <property name="webapps.build" value="${tomcat.build}/server/webapps"/>
       </ant>
   
  +    <touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" />
  +  </target>
  +
  +
  +  <target name="build" depends="init"
  +          description="Builds all components">
  +
  +    <antcall target="build-servletapi"/>
  +    <antcall target="build-jspapi"/>
  +    <antcall target="build-tomcatutil"/>
  +
  +    <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>
  +
  +    <antcall target="build-tomcatcoyote"/>
  +
  +    <antcall target="build-tomcatjk"/>
  +      
       <echo>========== Building: tomcat-httpd </echo>
   
       <ant dir="${jtc.home}/http11" target="compile">
  @@ -702,7 +744,8 @@
   
     <!-- ==================== Download or build the required binary packages ==================== -->
   
  -  <target name="download" depends="proxyflags">
  +  <target name="download" depends="proxyflags" 
  +          description="Download binary packages" >
   
       <!-- commons-digester needs ../LICENSE -->
       <!-- That is ugly XXX needs a review -->
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>