mwomack 2005/06/01 21:49:13
Modified: . Tag: v1_2-branch build.xml
Log:
Cosmetic changes.
Changes javac to use target attribute of 1.1. Per the Ant documentation:
"Generate class files for specific VM version (e.g., 1.1 or 1.2). Note that the
default value depends on the JVM that is running Ant. In particular, if you use
JDK 1.4+ the generated classes will not be usable for a 1.1 Java VM unless you
explicitly set this attribute to the value 1.1 (which is the default value for
JDK 1.1 to 1.3). We highly recommend to always specify this attribute."
Revision Changes Path
No revision
No revision
1.34.2.20 +90 -90 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.34.2.19
retrieving revision 1.34.2.20
diff -u -r1.34.2.19 -r1.34.2.20
--- build.xml 28 May 2005 01:49:54 -0000 1.34.2.19
+++ build.xml 2 Jun 2005 04:49:13 -0000 1.34.2.20
@@ -178,44 +178,42 @@
<target name="build.core" depends="init">
<mkdir dir="${javac.dest}" />
<javac srcdir="${java.source.dir}"
- destdir="${javac.dest}"
- includes="${stem}/**/*.java,
+ destdir="${javac.dest}"
+ includes="${stem}/**/*.java,
${stem}/xml/XMLLayout.java"
- excludes="misc/*, **/UnitTest*.java,
+ excludes="misc/*, **/UnitTest*.java,
**/StressCategory.java,
**/doc-files/*,
${stem}/xml/**,
${stem}/test/serialization/**,
- ${stem}/net/SMTPAppender.java,
- ${stem}/net/JMS*.java,
- ${stem}/jmx/*.java,
- ${stem}/or/jms/*.java"
- deprecation="${deprecation}"
- debug="on">
+ ${stem}/net/SMTPAppender.java,
+ ${stem}/net/JMS*.java,
+ ${stem}/jmx/*.java,
+ ${stem}/or/jms/*.java"
+ target="1.1"
+ deprecation="${deprecation}"
+ debug="on">
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${javac.dest}">
- <fileset dir="${java.source.dir}"
- includes="${stem}/lf5/**/*.properties"/>
- <fileset dir="${java.source.dir}"
- includes="${stem}/lf5/viewer/images/*"/>
- </copy>
+ <fileset dir="${java.source.dir}"
includes="${stem}/lf5/**/*.properties"/>
+ <fileset dir="${java.source.dir}"
includes="${stem}/lf5/viewer/images/*"/>
+ </copy>
</target>
<target name="build.examples" depends="build.core">
<mkdir dir="${javac.dest}" />
<javac srcdir="${basedir}"
- destdir="${javac.dest}"
- includes="examples/**/*.java"
- classpath="${classpath}"
- excludes="misc/*"
- deprecation="${deprecation}"
+ destdir="${javac.dest}"
+ includes="examples/**/*.java"
+ classpath="${classpath}"
+ excludes="misc/*"
+ target="1.1"
+ deprecation="${deprecation}"
debug="on"/>
- <rmic base="${javac.dest}"
- classname="examples.NumberCruncherServer"
- />
+ <rmic base="${javac.dest}" classname="examples.NumberCruncherServer"/>
<copy todir="${javac.dest}">
<fileset dir="." includes="examples/lf5/**/*.properties"/>
@@ -226,43 +224,46 @@
<target name="build.xml" depends="init, jaxp" if="jaxp-present">
<javac srcdir="${java.source.dir}"
- destdir="${javac.dest}"
- includes="${stem}/xml/**/*.java"
+ destdir="${javac.dest}"
+ includes="${stem}/xml/**/*.java"
excludes="${stem}/xml/examples/doc-files/**.java,
- ${stem}/xml/Transform.java"
- deprecation="${deprecation}"
- classpath="${classpath}">
+ ${stem}/xml/Transform.java"
+ target="1.1"
+ deprecation="${deprecation}"
+ classpath="${classpath}">
<classpath refid="compile.classpath"/>
</javac>
- <copy file="${BSTEM}/xml/log4j.dtd"
- tofile="${javac.dest}/${stem}/xml/log4j.dtd" />
+ <copy file="${BSTEM}/xml/log4j.dtd"
tofile="${javac.dest}/${stem}/xml/log4j.dtd" />
</target>
<target name="build.javamail" depends="init, javamail"
if="javamail-present">
<javac srcdir="${java.source.dir}"
- destdir="${javac.dest}"
- deprecation="${deprecation}"
- includes="${stem}/net/SMTPAppender.java">
+ destdir="${javac.dest}"
+ includes="${stem}/net/SMTPAppender.java"
+ target="1.1"
+ deprecation="${deprecation}">
<classpath refid="compile.classpath"/>
</javac>
</target>
<target name="build.jms" depends="init, jms, jndi" if="jms-present">
- <javac deprecation="${deprecation}"
- srcdir="${java.source.dir}"
- destdir="${javac.dest}"
- includes="${stem}/net/JMS*.java, ${stem}/or/jms/*.java">
+ <javac srcdir="${java.source.dir}"
+ destdir="${javac.dest}"
+ includes="${stem}/net/JMS*.java, ${stem}/or/jms/*.java"
+ target="1.1"
+ deprecation="${deprecation}">
<classpath refid="compile.classpath"/>
</javac>
</target>
<target name="build.jmx" depends="init, jmx, jndi" if="jmx-present">
- <javac deprecation="${deprecation}"
- srcdir="${java.source.dir}"
- destdir="${javac.dest}"
- includes="${stem}/jmx/*.java"
- excludes="${stem}/jmx/T.java">
+ <javac srcdir="${java.source.dir}"
+ destdir="${javac.dest}"
+ includes="${stem}/jmx/*.java"
+ excludes="${stem}/jmx/T.java"
+ target="1.1"
+ deprecation="${deprecation}">
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -329,28 +330,27 @@
</delete>
<jar jarfile="${jar.dest}/${jar.filename}" basedir="${javac.dest}"
- includes="${stem}/*.class,
- ${stem}/xml/log4j.dtd,
- ${stem}/config/*.class,
- ${stem}/helpers/*.class,
- ${stem}/spi/*.class,
- ${stem}/net/*.class,
- ${stem}/jdbc/*.class,
- ${stem}/varia/*.class,
- ${stem}/chainsaw/*.class,
- ${stem}/lf5/**/*.class,
- ${stem}/lf5/**/*.properties,
- ${stem}/lf5/**/*.gif,
- ${stem}/nt/*.class,
- ${stem}/xml/*.class,
- ${stem}/jmx/*.class,
- ${stem}/or/*.class,
- ${stem}/or/sax/*.class,
- ${stem}/or/jms/*.class,
- ${stem}/config/*.class"
- excludes="**/UnitTest**"
- manifest="${jar.dest}/manifest.mf"
- />
+ includes="${stem}/*.class,
+ ${stem}/xml/log4j.dtd,
+ ${stem}/config/*.class,
+ ${stem}/helpers/*.class,
+ ${stem}/spi/*.class,
+ ${stem}/net/*.class,
+ ${stem}/jdbc/*.class,
+ ${stem}/varia/*.class,
+ ${stem}/chainsaw/*.class,
+ ${stem}/lf5/**/*.class,
+ ${stem}/lf5/**/*.properties,
+ ${stem}/lf5/**/*.gif,
+ ${stem}/nt/*.class,
+ ${stem}/xml/*.class,
+ ${stem}/jmx/*.class,
+ ${stem}/or/*.class,
+ ${stem}/or/sax/*.class,
+ ${stem}/or/jms/*.class,
+ ${stem}/config/*.class"
+ excludes="**/UnitTest**"
+ manifest="${jar.dest}/manifest.mf"/>
</target>
@@ -362,33 +362,33 @@
<mkdir dir="${javadoc.dest}" />
<javadoc sourcepath="${java.source.dir}"
- destdir="${javadoc.dest}"
- packagenames="org.apache.log4j,
- org.apache.log4j.config,
- org.apache.log4j.helpers,
- org.apache.log4j.jmx,
- org.apache.log4j.lf5,
- org.apache.log4j.net,
- org.apache.log4j.nt,
- org.apache.log4j.or,
- org.apache.log4j.jdbc,
- org.apache.log4j.or.sax,
- org.apache.log4j.or.jms,
- org.apache.log4j.performance,
- org.apache.log4j.spi,
- org.apache.log4j.varia,
- org.apache.log4j.chainsaw,
- org.apache.log4j.xml,
- org.apache.log4j.xml.examples"
- 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-2005 Apache Software Foundation.">
+ destdir="${javadoc.dest}"
+ packagenames="org.apache.log4j,
+ org.apache.log4j.config,
+ org.apache.log4j.helpers,
+ org.apache.log4j.jmx,
+ org.apache.log4j.lf5,
+ org.apache.log4j.net,
+ org.apache.log4j.nt,
+ org.apache.log4j.or,
+ org.apache.log4j.jdbc,
+ org.apache.log4j.or.sax,
+ org.apache.log4j.or.jms,
+ org.apache.log4j.performance,
+ org.apache.log4j.spi,
+ org.apache.log4j.varia,
+ org.apache.log4j.chainsaw,
+ org.apache.log4j.xml,
+ org.apache.log4j.xml.examples"
+ 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-2005 Apache Software Foundation.">
<link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
<link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
