Fix conditional compilation. The official distribution must include support
for all loggers, for development it should be enough to have one. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138861 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
15
build.xml
15
build.xml
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
"Logging" component of the Jakarta Commons Subproject
|
"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 $
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|
||||||
@@ -140,7 +140,16 @@
|
|||||||
description="Compile shareable components">
|
description="Compile shareable components">
|
||||||
<available property="jdk.1.4.present"
|
<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}"/>
|
<echo message="jdk.1.4.present=${jdk.1.4.present}"/>
|
||||||
|
<echo message="log4j.present=${log4j.present}"/>
|
||||||
|
<echo message="logkit.present=${logkit.present}"/>
|
||||||
|
|
||||||
|
|
||||||
<javac srcdir="${source.home}"
|
<javac srcdir="${source.home}"
|
||||||
destdir="${build.home}/classes"
|
destdir="${build.home}/classes"
|
||||||
debug="${compile.debug}"
|
debug="${compile.debug}"
|
||||||
@@ -149,6 +158,10 @@
|
|||||||
<classpath refid="compile.classpath"/>
|
<classpath refid="compile.classpath"/>
|
||||||
<exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
|
<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>
|
</javac>
|
||||||
<copy todir="${build.home}/classes" filtering="on">
|
<copy todir="${build.home}/classes" filtering="on">
|
||||||
<fileset dir="${source.home}" excludes="**/*.java"/>
|
<fileset dir="${source.home}" excludes="**/*.java"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user