psmith 2005/02/24 19:11:30
Modified: . build.xml
Log:
First part of moving out Chainsaw into it's own module. This tidys up the
log4j build process
to not need to reference chainsaw at all.
Note: I've explicity added the ListModelAppender into the log4j core via this
change, while
this is an Appender that Chainsaw uses (and maybe it won't forever), it is a
generally useful feature outside the scope of Chainsaw. I'm happy to move
this into the Chainsaw module if
no-one thinks it's of much use in the core.
Revision Changes Path
1.150 +3 -31 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- build.xml 21 Feb 2005 23:32:13 -0000 1.149
+++ build.xml 25 Feb 2005 03:11:30 -0000 1.150
@@ -34,9 +34,6 @@
<!-- The jar file that the jar task will generate -->
<property name="log4j.jar" value="log4j-${version}.jar"/>
- <!-- the jar file for Chainsaw that will be generated -->
- <property name="log4j-chainsaw.jar" value="log4j-chainsaw-${version}.jar"/>
-
<!-- Destination for documentation files -->
<property name="docs.dest" value="./docs"/>
<!-- Source directory for xml docs -->
@@ -110,9 +107,6 @@
log4j-'dep'.jar - where 'dep' is one of "optional", "jms", "db", "smtp"
and "xml".
jar - build all jar files
- build.chainsaw - build chainsaw classes
- chainsaw.har - build chainsaw.jar
- chainsaw - run chainsaw
javadoc - build project javadoc files
@@ -235,7 +229,7 @@
<target name="build" description="Compile all log4j components."
depends="init, build.core, build.oro, build.jms, build.smtp,
build.db,
- build.examples, build.chainsaw"/>
+ build.examples"/>
<target name="requiredepsCheck"
depends="jndiCheck,jmsCheck,oroCheck,javamailCheck,servletAPICheck,jdbcExtensionCheck,jaxpCheck"
@@ -267,7 +261,6 @@
**/UnitTest*.java,
**/StressCategory.java,
**/doc-files/*,
- ${stem}/chainsaw/**,
${stem}/db/**,
${stem}/test/serialization/**,
${stem}/net/SMTPAppender.java,
@@ -284,27 +277,6 @@
</target>
- <target name="build.chainsaw" depends="init, build.core, build.oro,
build.xml">
- <ant antfile="build-chainsaw.xml" target="build.chainsaw"/>
- </target>
-
- <target name="chainsaw.jar" depends="build.chainsaw, log4j.jar,
- log4j-xml.jar,
- log4j-optional.jar">
- <ant antfile="build-chainsaw.xml" target="chainsaw.jar"/>
- </target>
-
- <target name="chainsaw" depends="log4j.jar, log4j-xml.jar,
log4j-optional.jar"
- description="Builds and runs Chainsaw v2" >
- <ant antfile="build-chainsaw.xml" target="chainsaw"/>
- </target>
-
- <target name="webstart" depends="ugli.jar, log4j.jar, log4j-optional.jar,
- chainsaw.jar, log4j-jms.jar, log4j-smtp.jar,
- log4j-db.jar, log4j-oro.jar, log4j-xml.jar">
- <ant antfile="build-chainsaw.xml" target="webstart"/>
- </target>
-
<!-- ================================================= -->
<!-- Compile examples -->
@@ -520,7 +492,7 @@
<!-- Actual work is done in the dependencies. -->
<!-- ================================================================= -->
<target name="jar" depends="ugli.jar, log4j.jar, log4j-optional.jar,
- chainsaw.jar, log4j-jms.jar, log4j-smtp.jar,
+ log4j-jms.jar, log4j-smtp.jar,
log4j-db.jar, log4j-oro.jar, log4j-xml.jar">
</target>
@@ -557,7 +529,7 @@
${stem}/pattern/*.class,
${stem}/or/*.class,
${stem}/or/sax/*.class,
- ${stem}/varia/ListAppender.class
+ ${stem}/varia/List*Appender.class
${stem}/plugins/*.class,
${stem}/config/*.class"
excludes="org/apache/ugli/**/JDK14*.class,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
