costin      02/02/14 13:04:18

  Modified:    logging  build.xml
  Log:
  Fix conditional compilation. The official distribution must include support
  for all loggers, for development it should be enough to have one.
  
  Revision  Changes    Path
  1.10      +22 -9     jakarta-commons/logging/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/logging/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml 3 Feb 2002 01:44:03 -0000       1.9
  +++ build.xml 14 Feb 2002 21:04:18 -0000      1.10
  @@ -3,7 +3,7 @@
   
   <!--
           "Logging" component of the Jakarta Commons Subproject
  -        $Id: build.xml,v 1.9 2002/02/03 01:44:03 sanders Exp $
  +        $Id: build.xml,v 1.10 2002/02/14 21:04:18 costin Exp $
   -->
   
   
  @@ -137,20 +137,33 @@
   
   
     <target name="compile" depends="static"
  -   description="Compile shareable components">
  +          description="Compile shareable components">
       <available property="jdk.1.4.present"
  -              classname="java.util.logging.Logger"/>
  +               classname="java.util.logging.Logger"/>
  +    <available property="log4j.present"
  +               classname="org.apache.log4j.Category"/>
  +    <available property="logkit.present"
  +               classname="org.apache.log.Logger"/>
  +
       <echo  message="jdk.1.4.present=${jdk.1.4.present}"/>
  -    <javac  srcdir="${source.home}"
  +    <echo  message="log4j.present=${log4j.present}"/>
  +    <echo  message="logkit.present=${logkit.present}"/>
  +
  +
  +    <javac srcdir="${source.home}"
              destdir="${build.home}/classes"
  -             debug="${compile.debug}"
  -       deprecation="${compile.deprecation}"
  -          optimize="${compile.optimize}">
  +           debug="${compile.debug}"
  +           deprecation="${compile.deprecation}"
  +           optimize="${compile.optimize}">
         <classpath refid="compile.classpath"/>
         <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
  -             unless="jdk.1.4.present"/>
  +               unless="jdk.1.4.present"/>
  +      <exclude name="org/apache/commons/logging/impl/Log4JCategoryLog.java"
  +               unless="log4j.present"/>
  +      <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"
  +               unless="logkit.present"/>
       </javac>
  -    <copy    todir="${build.home}/classes" filtering="on">
  +    <copy  todir="${build.home}/classes" filtering="on">
         <fileset dir="${source.home}" excludes="**/*.java"/>
       </copy>
     </target>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to