1
0

Tab->space conversions only.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@381232 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2006-02-27 02:37:19 +00:00
parent abfdb4af34
commit 6575f84d9e

131
build.xml
View File

@@ -280,7 +280,7 @@
<available file="${log4j12.jar}" property="log4j12.present"/> <available file="${log4j12.jar}" property="log4j12.present"/>
<available file="${log4j13.jar}" property="log4j13.present"/> <available file="${log4j13.jar}" property="log4j13.present"/>
<available file="${build.home}/docs" property="maven.generated.docs.present"/> <available file="${build.home}/docs" property="maven.generated.docs.present"/>
</target> </target>
<target name="log4j12-warning" unless='log4j12.present' depends='init,discovery'> <target name="log4j12-warning" unless='log4j12.present' depends='init,discovery'>
@@ -372,36 +372,36 @@
</target> </target>
<target name="compile-1.4" depends="prepare,discovery,compile-non-log4j" if='executable.javac1.4'> <target name="compile-1.4" depends="prepare,discovery,compile-non-log4j" if='executable.javac1.4'>
<!-- <!--
Compiles those classes which require a 1.4+ JSDK. - Compiles those classes which require a 1.4+ JSDK.
This target will only be executed when ant is running a pre-1.4 JVM - This target will only be executed when ant is running a pre-1.4 JVM
and the home.jdk4 property is set. - and the home.jdk4 property is set.
This configuration is typically used to create a release only. - This configuration is typically used to create a release only.
--> -->
<echo message=""/> <echo message=""/>
<echo message="************************************************************"/> <echo message="************************************************************"/>
<echo message=" Compiling 1.4 only classes using compiler@${executable.javac1.4}"/> <echo message=" Compiling 1.4 only classes using compiler@${executable.javac1.4}"/>
<echo message="************************************************************"/> <echo message="************************************************************"/>
<echo message=""/> <echo message=""/>
<javac srcdir="${source.home}" <javac srcdir="${source.home}"
destdir="${build.home}/classes" destdir="${build.home}/classes"
debug="${compile.debug}" debug="${compile.debug}"
deprecation="${compile.deprecation}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}" optimize="${compile.optimize}"
source="${source.version}" source="${source.version}"
target="${target.version}" target="${target.version}"
compiler='javac1.4' compiler='javac1.4'
fork='yes' fork='yes'
executable='${executable.javac1.4}'> executable='${executable.javac1.4}'>
<classpath refid="compile.classpath"/> <classpath refid="compile.classpath"/>
<include name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" <include name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
unless="jdk.1.4.present"/> unless="jdk.1.4.present"/>
<include name="org/apache/commons/logging/impl/Jdk14Logger.java" <include name="org/apache/commons/logging/impl/Jdk14Logger.java"
unless="jdk.1.4.present"/> unless="jdk.1.4.present"/>
</javac> </javac>
</target> </target>
<target name="compile-log4j12" depends="prepare,discovery"> <target name="compile-log4j12" depends="prepare,discovery">
<!-- compile the log4j1.2 support classes --> <!-- compile the log4j1.2 support classes -->
@@ -415,10 +415,10 @@ This configuration is typically used to create a release only.
<classpath refid="compile.classpath"/> <classpath refid="compile.classpath"/>
<classpath> <classpath>
<!-- <!--
<pathelement refid="compile.classpath"/> <pathelement refid="compile.classpath"/>
<classpath refid="compile.classpath"/> <classpath refid="compile.classpath"/>
--> -->
<pathelement location="${log4j12.jar}"/> <pathelement location="${log4j12.jar}"/>
</classpath> </classpath>
@@ -573,14 +573,13 @@ This configuration is typically used to create a release only.
</target> </target>
<target name="clean" <target name="clean" description="Clean build and distribution directories">
description="Clean build and distribution directories"> <mkdir dir='${build.home}'/>
<mkdir dir='${build.home}'/>
<delete includeemptydirs='yes'> <delete includeemptydirs='yes'>
<fileset dir="${build.home}" excludes='docs/**/*'/> <fileset dir="${build.home}" excludes='docs/**/*'/>
</delete> </delete>
<delete dir="${dist.home}"/> <delete dir="${dist.home}"/>
<delete dir="${artifacts.home}"/> <delete dir="${artifacts.home}"/>
</target> </target>
@@ -597,16 +596,16 @@ This configuration is typically used to create a release only.
<target name="dist" depends="all,maven-docs-warning" <target name="dist" depends="all,maven-docs-warning"
description="Create binary distribution"> description="Create binary distribution">
<!-- <!--
Maven is used to generate the documentation. - Maven is used to generate the documentation.
However, we cannot assume that it has been run. - However, we cannot assume that it has been run.
So, create the appropriate directories. - So, create the appropriate directories.
--> -->
<mkdir dir='${build.home}'/> <mkdir dir='${build.home}'/>
<mkdir dir='${build.home}/docs'/> <mkdir dir='${build.home}/docs'/>
<mkdir dir='${build.home}/docs/apidocs'/> <mkdir dir='${build.home}/docs/apidocs'/>
<!-- <!--
- Create a dist directory to hold all the files that go into a distribution. - Create a dist directory to hold all the files that go into a distribution.
@@ -626,9 +625,7 @@ This configuration is typically used to create a release only.
</fileset> </fileset>
</copy> </copy>
<!-- <!-- Copy documentation generated by maven -->
Copy documentation generated by maven
-->
<mkdir dir="${dist.home}/docs"/> <mkdir dir="${dist.home}/docs"/>
<copy todir="${dist.home}/docs"> <copy todir="${dist.home}/docs">
<fileset dir="${build.home}/docs"/> <fileset dir="${build.home}/docs"/>
@@ -642,28 +639,26 @@ This configuration is typically used to create a release only.
<copy todir="${dist.home}/src" filtering="on"> <copy todir="${dist.home}/src" filtering="on">
<fileset dir="${source.home}"/> <fileset dir="${source.home}"/>
</copy> </copy>
<zip destfile='${dist.home}/${src.ide.name}'> <zip destfile='${dist.home}/${src.ide.name}'>
<zipfileset dir='${dist.home}/src'/> <zipfileset dir='${dist.home}/src'/>
<zipfileset dir='${dist.home}/docs/apidocs'/> <zipfileset dir='${dist.home}/docs/apidocs'/>
<zipfileset dir='${dist.home}' prefix='META-INF'> <zipfileset dir='${dist.home}' prefix='META-INF'>
<include name="LICENSE.txt"/> <include name="LICENSE.txt"/>
<include name="NOTICE.txt"/> <include name="NOTICE.txt"/>
</zipfileset> </zipfileset>
</zip> </zip>
<!-- <!-- Create release artifacts in the artifacts directory -->
Create release artifacts in the artifacts directory <mkdir dir="${artifacts.home}"/>
--> <fixcrlf srcdir='${dist.home}' eol='dos' includes='**/*.txt,**/*.java,**/*.html'/>
<mkdir dir="${artifacts.home}"/> <zip destfile='${artifacts.home}/${windows.dist.name}'>
<fixcrlf srcdir='${dist.home}' eol='dos' includes='**/*.txt,**/*.java,**/*.html'/> <zipfileset dir='${dist.home}' prefix='commons-${component.name}-${component.version}'/>
<zip destfile='${artifacts.home}/${windows.dist.name}'> </zip>
<zipfileset dir='${dist.home}' prefix='commons-${component.name}-${component.version}'/> <fixcrlf srcdir='${dist.home}' eol='unix' includes='**/*.txt,**/*.java,**/*.html'/>
</zip> <tar compression="gzip" destfile='${artifacts.home}/${nix.dist.name}' longfile='gnu'>
<fixcrlf srcdir='${dist.home}' eol='unix' includes='**/*.txt,**/*.java,**/*.html'/> <tarfileset dir='${dist.home}' prefix='commons-${component.name}-${component.version}'/>
<tar compression="gzip" destfile='${artifacts.home}/${nix.dist.name}' longfile='gnu'>
<tarfileset dir='${dist.home}' prefix='commons-${component.name}-${component.version}'/>
</tar> </tar>
<copy todir="${artifacts.home}"> <copy todir="${artifacts.home}">
<fileset dir="${build.home}"> <fileset dir="${build.home}">
<include name="${core.jar.name}"/> <include name="${core.jar.name}"/>
<include name="${api.jar.name}"/> <include name="${api.jar.name}"/>