Return-Path: <remm@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 47117 invoked by uid 500); 5 Nov 2000 06:22:52 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Received: (qmail 47114 invoked by uid 1135); 5 Nov 2000 06:22:52 -0000
Date: 5 Nov 2000 06:22:52 -0000
Message-ID: <20001105062252.47112.qmail@locus.apache.org>
From: remm@locus.apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-4.0/catalina build.xml

remm        00/11/04 22:22:51

  Modified:    catalina build.xml
  Log:
  - Conditional compilation variables were not properly set for some reason,
    probably because this buildfile is actually called from the main buildfile.
    As a result, neither Tyrex nor JTA is needed anymore to build Tomcat 4.
    Sorry for the problem ...
  
    Bug reported by Terena Chinn-Fujii.
  
  Revision  Changes    Path
  1.22      +7 -6      jakarta-tomcat-4.0/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build.xml	2000/11/05 01:16:36	1.21
  +++ build.xml	2000/11/05 06:22:50	1.22
  @@ -26,12 +26,6 @@
       <mkdir dir="${catalina.build}/conf"/>
       <mkdir dir="${catalina.build}/lib"/>
       <mkdir dir="${catalina.build}/server"/>
  -
  -    <!-- =================== Conditional Compilation Falgs ================ -->
  -    <available property="tyrex.present"
  -     classname="tyrex.jdbc.ServerDataSource" />
  -    <available property="jta.present"
  -     classname="javax.transaction.UserTransaction" />
     </target>
   
   
  @@ -73,6 +67,13 @@
   
     <!-- ================= BUILD: Compile Server Components ================= -->
     <target name="build-main" depends="build-static">
  +
  +
  +    <!-- =================== Conditional Compilation Falgs ================ -->
  +    <available property="tyrex.present"
  +     classname="tyrex.jdbc.ServerDataSource" />
  +    <available property="jta.present"
  +     classname="javax.transaction.UserTransaction" />
   
       <!-- Compile internal server components -->
       <javac   srcdir="src/share" destdir="${catalina.build}/classes"