Return-Path: 
 <commons-dev-return-871-qmlist-jakarta-archive-commons-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@apache.org
Received: (qmail 49958 invoked from network); 28 Nov 2001 10:29:20 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 28 Nov 2001 10:29:20 -0000
Received: (qmail 27503 invoked by uid 97); 28 Nov 2001 10:29:29 -0000
Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org
Received: (qmail 27450 invoked by uid 97); 28 Nov 2001 10:29:28 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 27439 invoked by uid 97); 28 Nov 2001 10:29:27 -0000
Date: 28 Nov 2001 10:12:29 -0000
Message-ID: <20011128101229.92125.qmail@icarus.apache.org>
From: dlr@apache.org
To: jakarta-commons-sandbox-cvs@apache.org
Subject: cvs commit: jakarta-commons-sandbox/util 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

dlr         01/11/28 02:12:29

  Modified:    util     build.xml
  Log:
  Some changes to the build file by Lance Lavandowska <lance@brainopolis.com> and myself.
  
  Revision  Changes    Path
  1.5       +33 -5     jakarta-commons-sandbox/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/util/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- build.xml	2001/08/24 16:45:35	1.4
  +++ build.xml	2001/11/28 10:12:29	1.5
  @@ -1,13 +1,13 @@
   <project name="Jakarta Commons Utilities" default="jar" basedir=".">
   
   <!--
  -        $Id: build.xml,v 1.4 2001/08/24 16:45:35 dlr Exp $
  +        $Id: build.xml,v 1.5 2001/11/28 10:12:29 dlr Exp $
   -->
   
   <!-- ========== Initialize Properties =================================== -->
   
   
  -  <property file="./build.properties"/>                <!-- Component local   -->
  +  <property file="./build.properties"/>              <!-- Component loc   -->
     <property file="../build.properties"/>             <!-- Commons local     -->
     <property file="${user.home}/build.properties"/>   <!-- User local        -->
   
  @@ -18,12 +18,21 @@
       <pathelement location="${build.home}/class"/>
     </path>
   
  +  <path id="servlet.classpath">
  +    <path refid="compile.classpath"/>
  +    <path location="jsdk.jar"/>
  +  </path>
  +
     <path id="test.classpath">
       <pathelement location="${build.home}/class"/>
       <pathelement location="${build.home}/test"/>
       <pathelement location="${junit.jar}"/>
     </path>
   
  +  <path id="servlet.classpath">
  +  	<pathelement location="${servlet.jar}" />
  +  </path>
  +
   
   <!-- ========== Executable Targets ====================================== -->
   
  @@ -37,6 +46,10 @@
         classname="junit.framework.TestCase"
         property="junit.present"
         classpathref="test.classpath"/>
  +    <available
  +      classname="javax.servlet.http.HttpServletRequest"
  +      property="servlet.request.present"
  +      classpathref="servlet.classpath"/>
     </target>
   
   
  @@ -58,6 +71,8 @@
         description="Compile shareable components">
   
       <javac srcdir="${source.home}/java"
  +      excludes="org/apache/commons/util/http/RequestUtils.java,
  +                org/apache/commons/util/http/ExtendedBrowserDetector.java"
         destdir="${build.home}/class"
         debug="${compile.debug}"
         deprecation="${compile.deprecation}"
  @@ -67,6 +82,19 @@
   
     </target>
   
  +  <target name="compile-request" depends="compile" if="servlet.request.present"
  +          description="Compiles classes dependant on the HttpServletRequest class">
  +
  +    <javac srcdir="${source.home}/java"
  +      includes="org/apache/commons/util/http/RequestUtils.java,
  +                org/apache/commons/util/http/ExtendedBrowserDetector.java"
  +      destdir="${build.home}/class"
  +      debug="${compile.debug}"
  +      deprecation="${compile.deprecation}"
  +      optimize="${compile.optimize}">
  +      <classpath refid="servlet.classpath"/>
  +    </javac>
  +  </target>
   
     <target name="clean"
      description="Clean build and distribution directories">
  @@ -75,7 +103,7 @@
     </target>
   
   
  -  <target name="all" depends="clean,compile"
  +  <target name="all" depends="clean,compile,compile-request"
      description="Clean and compile all components"/>
   
   
  @@ -96,14 +124,14 @@
     </target>
   
   
  -  <target name="jar" depends="compile" description="Build jar">
  +  <target name="jar" depends="compile,compile-request" description="Build jar">
          <jar jarfile="${component.jar}"
            basedir="${build.home}/class"
            manifest="${source.home}/conf/MANIFEST.MF" />
     </target>
   
   
  -  <target name="dist" depends="compile,javadoc"
  +  <target name="dist" depends="compile,compile-request,javadoc"
      description="Create binary distribution">
       <mkdir dir="${dist.home}"/>
       <copy file="LICENSE" todir="${dist.home}"/>
  
  
  

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