psmith 2003/06/25 15:20:09
Modified: . build.xml
Log:
fix for hubris on my part thinking that everyone would be wanting
to run Chainsaw.
It is now not required to have Jakarta ORO to build just the Log4j core.
The 'build' target now does NOT compile any chainsaw files.
The 'chainsaw' target relies on the 'build' target and requires the ORO
configured otherwise an friendly error message is displayed.
Thanks to Raymond DeCampo for spotting this.
Revision Changes Path
1.67 +13 -1 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- build.xml 25 Jun 2003 08:25:53 -0000 1.66
+++ build.xml 25 Jun 2003 22:20:08 -0000 1.67
@@ -202,6 +202,7 @@
${stem}/net/SMTPAppender.java,
${stem}/net/JMS*.java,
${stem}/jmx/*.java,
+ ${stem}/chainsaw/*.java,
${stem}/varia/Log4JAvalonLogger.java,
${stem}/or/jms/*.java"
deprecation="${deprecation}"
@@ -288,6 +289,17 @@
</javac>
</target>
+ <target name="build.chainsaw" depends="init, check-for-oro, build.core">
+ <javac deprecation="${deprecation}"
+ srcdir="${java.source.dir}"
+ destdir="${javac.dest}"
+ includes="${stem}/chainsaw/**/*.java"
+ excludes="">
+ <classpath refid="compile.classpath"/>
+ <classpath path="${regexp.oro.jar}"/>
+ </javac>
+ </target>
+
<!-- ================================================================= -->
<!-- Remove all generated (compiled) class files. -->
<!-- ================================================================= -->
@@ -390,7 +402,7 @@
<fail unless="external.libraries.oro.present" message="Chainsaw v2 needs
Jakarta ORO, and it appears your are missing the Jakarta ORO package. Please check
the build.properties file."/>
</target>
- <target name="chainsaw" depends="build, jar, check-for-oro" description="Builds
and runs Chainsaw v2">
+ <target name="chainsaw" depends="build.chainsaw, jar" description="Builds and
runs Chainsaw v2">
<!-- Need to fork to avoid problems -->
<java classname="org.apache.log4j.chainsaw.LogUI" fork="yes"
classpath="${jar.dest}/${log4j.jar};${jar.dest}/${log4j-chainsaw.jar};${ant.home}/lib/crimson.jar;${regexp.oro.jar}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
