From 5347bd9e5532456af06ff88fe06ad677f2467f69 Mon Sep 17 00:00:00 2001
From: "Craig R. McClanahan" <craigmcc@apache.org>
Date: Mon, 31 Mar 2003 00:38:22 +0000
Subject: [PATCH] Copy LICENSE.txt file into distribution, and make sure it is
 included in the JAR files, without going to the directory above the top-level
 directory. This will make it easier to build commons-logging from source
 distros.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@138964 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index e93decc..92e37c1 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
 
 <!--
         "Logging" component of the Jakarta Commons Subproject
-        $Id: build.xml,v 1.30 2003/03/31 00:20:19 craigmcc Exp $
+        $Id: build.xml,v 1.31 2003/03/31 00:38:22 craigmcc Exp $
 -->
 
 
@@ -168,9 +168,10 @@
           description="Compile shareable components"/>
 
   <target name="compile-only" depends="init" >
+
     <available property="jdk.1.4.present"
                classname="java.util.logging.Logger"/>
-    <available classname="org.apache.log4j.Category"
+    <available classname="org.apache.log4j.Logger"
                classpathref="compile.classpath"
                property="log4j.present"/>
     <available property="logkit.present"
@@ -181,7 +182,6 @@
     <echo  message="log4j.present=${log4j.present}"/>
     <echo  message="logkit.present=${logkit.present}"/>
 
-
     <javac srcdir="${source.home}"
            destdir="${build.home}/classes"
            debug="${compile.debug}"
@@ -200,11 +200,15 @@
     <copy  todir="${build.home}/classes" filtering="on">
       <fileset dir="${source.home}" excludes="**/*.java"/>
     </copy>
+    <mkdir      dir="${build.home}/classes/META-INF"/>
+    <copy      file="LICENSE.txt"
+              todir="${build.home}/classes/META-INF"/>
 
     <jar jarfile="${build.home}/commons-${component.name}.jar"
          basedir="${build.home}/classes"
          manifest="${build.home}/conf/MANIFEST.MF">
       <include name="org/apache/commons/logging/**" />
+      <include name="META-INF/LICENSE.txt"/>
     </jar>
 
     <jar jarfile="${build.home}/commons-${component.name}-api.jar"
@@ -215,6 +219,7 @@
       <include name="org/apache/commons/logging/impl/Jdk14*.class" />
       <include name="org/apache/commons/logging/impl/SimpleLog*.class" />
       <include name="org/apache/commons/logging/impl/NoOpLog*.class" />
+      <include name="META-INF/LICENSE.txt"/>
     </jar>
   </target>
 
@@ -282,13 +287,9 @@
 
   <target name="dist" depends="compile,javadoc"
    description="Create binary distribution">
-    <!-- TODO: top level files like LICENSE and README -->
     <mkdir      dir="${dist.home}"/>
-    <copy      file="../LICENSE"
+    <copy      file="LICENSE.txt"
               todir="${dist.home}"/>
-    <mkdir      dir="${build.home}/classes/META-INF"/>
-    <copy      file="../LICENSE"
-             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
     <copy file="${build.home}/commons-${component.name}.jar"
           tofile="${dist.home}/commons-${component.name}.jar" />
     <copy file="${build.home}/commons-${component.name}-api.jar"