You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2005/01/06 22:39:29 UTC
cvs commit: logging-log4j build-chainsaw.xml build.xml
ceki 2005/01/06 13:39:29
Modified: . build-chainsaw.xml build.xml
Log:
- Removed duplicate entries under the assumption that build-chainsaw.xml can be invoked only thourgh build.xml
- Removed the javadoc target.
- Probably broke the webstart targets.
Revision Changes Path
1.4 +14 -122 logging-log4j/build-chainsaw.xml
Index: build-chainsaw.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build-chainsaw.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-chainsaw.xml 5 Jan 2005 17:03:34 -0000 1.3
+++ build-chainsaw.xml 6 Jan 2005 21:39:28 -0000 1.4
@@ -1,77 +1,24 @@
-<project name="log4j" default="build" basedir="." >
-
-
- <!-- The build.properties file defines the parth to local jar files -->
- <property file="build.properties"/>
-
- <property name="version" value="1.3alpha-4"/>
-
- <!-- The base directory relative to which most targets are built -->
- <property name="base" value="."/>
-
- <!-- The directory where source files are stored. -->
- <property name="java.source.dir" value="src/java/"/>
-
- <!-- Deprecation warning? -->
- <property name="deprecation" value="on"/>
-
- <!-- Destination for compiled files -->
- <property name="javac.dest" value="classes"/>
-
- <!-- Destination for generated jar files -->
- <property name="jar.dest" value="${basedir}"/>
-
- <!-- The jar file that the jar task will generate -->
- <property name="log4j.jar" value="log4j-${version}.jar"/>
-
- <!-- The jar file that the jar-chainsaw task will generate -->
- <property name="log4j-chainsaw.jar" value="log4j-chainsaw-${version}.jar"/>
+<project name="log4j" default="usage" basedir="." >
<!-- When building a Java Web Start distribution of Chainsaw, some Receivers with external dependencies need to be packaged into a seperate Jar -->
<property name="webstart-dependant-receivers.jar" value="webstart-dependant-receivers.jar-${version}.jar"/>
- <!-- Javac with debug on/off. Log4j without debug on is hard to debug, so leave this settint on. -->
- <property name="debug" value="on"/>
-
- <!-- Destination for javadoc generated files -->
- <property name="javadoc.dest" value="docs/api"/>
-
- <!-- The stem where most log4j source code is located. -->
- <property name="stem" value="org/apache/log4j"/>
-
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${javac.dest}"/>
<pathelement location="${vfs.jar}"/>
</path>
- <!-- ================================================================= -->
- <!-- Default target -->
- <!-- ================================================================= -->
-
- <target name="usage">
- <echo>
-
- These are the targets supported by this ANT build scpript:
-
- build - compile Chainsaw. If a certain library is missing,
- then the compilation of its dependents are skipped.
-
- javadoc - build Chainsaw javadoc files
-
- jar - build Chainsaw jar file
-
- </echo>
- </target>
-
- <target name="init">
- <tstamp />
- </target>
-
- <target name="build" description="Compile Chainsaw."
- depends="init, build.chainsaw"/>
-
- <target name="build.chainsaw" depends="init,vfs">
+ <target name="usage">
+ <echo>
+ This build file cannot be invoked directly but only through
+ its parent build file, build.xml.
+ </echo>
+ </target>
+
+ <!-- This target is invoked through the build.chainsaw target in the parent build file
+ which depends on build.core ensuring that log4j core gets built before. -->
+ <target name="build.chainsaw" depends="vfs">
<mkdir dir="${javac.dest}" />
<javac deprecation="${deprecation}"
srcdir="${java.source.dir}"
@@ -85,13 +32,6 @@
</javac>
</target>
- <!-- ================================================================= -->
- <!-- Remove all generated (compiled) class files. -->
- <!-- ================================================================= -->
- <target name="clean" depends="init" description="Delete compiled Chainsaw files">
- <delete dir="${javac.dest}/" />
- </target>
-
<target name="log4jCheck">
<available filepath="${base}" file="${log4j.jar}" property="log4j-present"/>
@@ -132,15 +72,9 @@
</target>
<!-- ================================================================= -->
- <!-- Aactual work is done in the dependencies. -->
- <!-- ================================================================= -->
- <target name="jar" depends="chainsaw.jar" description="Create chainsaw jar">
- </target>
-
- <!-- ================================================================= -->
<!-- Create log4j-chainsaw.jar, excluding everything else -->
<!-- ================================================================= -->
- <target name="chainsaw.jar" depends="build">
+ <target name="chainsaw.jar" depends="build.chainsaw">
<delete>
<fileset dir="${jar.dest}">
<include name="${log4j-chainsaw.jar}"/>
@@ -209,7 +143,7 @@
<!-- distribution of Chainsaw -->
<!-- ================================================================= -->
- <target name="webstart-dependant-receivers.jar" depends="build">
+ <target name="webstart-dependant-receivers.jar" depends="build.chainsaw">
<delete>
<fileset dir="${jar.dest}">
<include name="${webstart-dependant-receivers.jar}"/>
@@ -231,7 +165,7 @@
<target name="webstart" >
<property name="webstart" value="true"/>
- <antcall target="jar"/>
+ <antcall target="chainsaw.jar"/>
<antcall target="webstart-dependant-receivers.jar"/>
<input
@@ -251,48 +185,6 @@
<fileset file="${regexp.oro.jar}"/>
<fileset file="src/chainsaw.bat"/>
</zip>
- </target>
-
- <!-- ================================================================= -->
- <!-- This target builds the javadoc files. -->
- <!-- ================================================================= -->
- <target name="javadoc" depends="init" description="Generate Chainsaw-related Javadoc">
-
- <mkdir dir="${javadoc.dest}" />
-
- <javadoc sourcepath="${java.source.dir}"
- destdir="${javadoc.dest}"
- packagenames="org.apache.log4j,
- org.apache.log4j.chainsaw,
- org.apache.log4j.chainsaw.color,
- org.apache.log4j.chainsaw.favourites,
- org.apache.log4j.chainsaw.filter,
- org.apache.log4j.chainsaw.help,
- org.apache.log4j.chainsaw.helper,
- org.apache.log4j.chainsaw.dnd,
- org.apache.log4j.chainsaw.icons,
- org.apache.log4j.chainsaw.layout,
- org.apache.log4j.chainsaw.messages,
- org.apache.log4j.chainsaw.plugins,
- org.apache.log4j.chainsaw.prefs,
- org.apache.log4j.chainsaw.receivers,
- org.apache.log4j.chainsaw.vfs"
- additionalparam="-breakiterator"
- version="true"
- protected="true"
- author="true"
- use="true"
- overview="${docs.dest}/overview.html"
- doctitle="log4j version ${version}<br>API Specification"
- windowtitle="Log4j Version ${version}"
- header="<b>Log4j ${version}</b>"
- bottom="Copyright 2000-2003 Apache Software Foundation.">
-
- <link href="http://java.sun.com/products/j2se/1.3/docs/api/"/>
- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <classpath refid="compile.classpath"/>
- <classpath path="${regexp.oro.jar}"/>
- </javadoc>
</target>
</project>
1.132 +3 -3 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- build.xml 5 Jan 2005 16:56:15 -0000 1.131
+++ build.xml 6 Jan 2005 21:39:28 -0000 1.132
@@ -98,7 +98,7 @@
These are the targets supported by this ANT build scpript:
build - compile all project files, if a certain library is missing,
- then the compilation of its dependents are skipped.
+ then the compilation of its dependents are skipped.
javadoc - build project javadoc files
@@ -242,11 +242,11 @@
</target>
- <target name="build.chainsaw">
+ <target name="build.chainsaw" depends="build.core">
<ant antfile="build-chainsaw.xml" target="build.chainsaw"/>
</target>
- <target name="chainsaw.jar">
+ <target name="chainsaw.jar" depends="build.core">
<ant antfile="build-chainsaw.xml" target="chainsaw.jar"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org