[slf4j-dev] svn commit: r201 - slf4j/trunk

[ceki at slf4j.org]

Author: ceki
Date: Fri Aug 26 21:47:06 2005
New Revision: 201

Modified:
   slf4j/trunk/build.xml
Log:
JCL implementation available in a seperate jar (jcl-over-slf4j.jar)

Modified: slf4j/trunk/build.xml
==============================================================================
--- slf4j/trunk/build.xml	(original)
+++ slf4j/trunk/build.xml	Fri Aug 26 21:47:06 2005
@@ -5,7 +5,7 @@
   <property file="build.properties"/>
 
   <!-- The directory where source files are stored. -->
-  <property name="version" value="1.0-beta5"/>
+  <property name="version" value="1.0-beta6"/>
 
   <property name="tmp.java.source.dir" value="./tmp/src"/>
   <property name="tmp.javac.dest" value="./tmp/classes"/>
@@ -16,7 +16,7 @@
   <property name="deprecation" value="on"/>
 	
   <property name="SLF4J_STEM" value="org/slf4j"/>
-  
+  <property name="JCL_STEM" value="org/apache/commons/logging"/>  
 
   <!-- ================================================================= -->
   <!-- Default target                                                    -->
@@ -56,17 +56,17 @@
   	</fail>
   </target>
 
+	
   <!-- =================================================================== -->
   <!-- Generic target that can build NOP, Simple and JDK14 implementations -->
   <!--  as specified by the "jar-name" and "impl" parameters.              -->
   <!-- =================================================================== -->
-  <target name="slf4j-IMPL.jar" depends="init">
-    
+  <target name="compile-IMPL" depends="init">
     <!-- delete all previously existing files in tmp -->
     <delete><fileset dir="tmp/" includes="**/*"/></delete>
 
     <!-- copy a filtered version of slf4j to tmp/src -->
-    <copy todir="tmp/src">
+    <copy todir="${tmp.java.source.dir}">
       <fileset dir="src/filtered-java">
         <include name="**/*.java"/>
       </fileset>
@@ -77,22 +77,33 @@
       </filterset>
     </copy>
 
-    <copy todir="tmp/src">
+    <copy todir="${tmp.java.source.dir}">
       <fileset dir="src/java">
         <include name="**/*.java"/>
       </fileset>
     </copy>
-
     
     <javac srcdir="${tmp.java.source.dir}"
            destdir="${tmp.javac.dest}"
            deprecation="on"
            includes="${SLF4J_STEM}/*.java,
-    	               ${SLF4J_STEM}/impl/MessageFormatter.java, 
-                     ${SLF4J_STEM}/impl/${impl}*.class"
-           debug="${debug}">
+    	             ${SLF4J_STEM}/impl/MessageFormatter.java, 
+                     ${SLF4J_STEM}/impl/${impl}*.java"
+  	       debug="${debug}">
     </javac>
+  	
+ </target>
+  	
+  <!-- =================================================================== -->
+  <!-- Generic target that can build NOP, Simple and JDK14 implementations -->
+  <!--  as specified by the "jar-name" and "impl" parameters.              -->
+  <!-- =================================================================== -->
+  <target name="slf4j-IMPL.jar" depends="init">
  
+    <antcall target="compile-IMPL">
+      <param name="IMPL" value="${IMPL}"/>
+    </antcall>
+    	
     <jar jarfile="${jar-name}" basedir="${tmp.javac.dest}"
         includes="${SLF4J_STEM}/*.class, 
                   ${SLF4J_STEM}/impl/MessageFormatter.class, 
@@ -132,7 +143,26 @@
     </antcall>
   </target>
 
-  <target name="jar" depends="slf4j-nop.jar, slf4j-simple.jar, slf4j-jdk14.jar"/> 	
+  <target name="jcl-on-slf4j.jar" depends="slf4j-nop.jar">
+  
+    <antcall target="compile-IMPL">
+        <param name="IMPL" value="NOP"/>
+    </antcall>
+  	
+  	<javac srcdir="${tmp.java.source.dir}"
+   	       destdir="${tmp.javac.dest}"
+   	       deprecation="on"
+   	       includes="${JCL_STEM}/**/*.java"
+   	       debug="${debug}">
+   	 </javac>
+   	
+     <jar jarfile="jcl-on-slf4j.jar" basedir="${tmp.javac.dest}"
+           includes="${JCL_STEM}/**/*.class">
+      </jar>
+  </target>
+
+	
+  <target name="jar" depends="slf4j-nop.jar, jcl-on-slf4j.jar, slf4j-simple.jar, slf4j-jdk14.jar"/> 	
 
   <!-- Build Javadoc -->
   <target name="javadoc" depends="init">
@@ -160,9 +190,8 @@
 
     <mkdir dir="${javadoc.dest}" />
     
-    <javadoc sourcepath="${tmp.java.source.dir}"
-             destdir="${javadoc.dest}"
-             packagenames="org.slf4j, org.slf4j.impl"
+    <javadoc destdir="${javadoc.dest}"
+             packagenames="org.slf4j.*, org.apache.commons.logging.*"
              additionalparam="-breakiterator"
              version="true"
              protected="true"
@@ -171,14 +200,37 @@
              overview="src/docs/overview.html"
              doctitle="SLF4J version ${version}"
              windowtitle="SLF4J Version ${version}"
-             header="&lt;b&gt;SLF4J ${version}&lt;/b&gt;"
-             bottom="Copyright 2004-2005 
-                &lt;a href=http://www.slf4j.org&gt;
-                &lt;b&gt;SLF4J.ORG&lt;b&gt;&lt;a&gt;">
-      
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-      <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
-     
+             >
+
+    	<sourcepath>
+          <path path="${tmp.java.source.dir}"/>
+    	</sourcepath>
+    	
+        <group>
+           <title>SLF4J</title>
+           <package name="org.slf4j"/>
+           <package name="org.slf4j.impl"/>
+        </group>
+
+    	 <group>
+    	   <title>Jakarta Commons Logging (implemented over SLF4J)</title>
+    	   <package name="org.apache.commons.logging"/>
+    	   <package name="org.apache.commons.logging.impl"/>
+    	 </group>
+
+        	
+    	<header>
+          &lt;b&gt;SLF4J ${version}&lt;/b&gt;&lt;br/&gt;
+        </header>
+    	<footer>
+      	   Copyright 2004-2005  
+      	   &lt;a href="http://www.slf4j.org"&gt;&lt;b&gt;SLF4J.ORG&lt;/b&gt;&lt;/a&gt;
+    	   &lt;br/&gt;
+    		
+      	</footer>
+    	<bottom>
+    		&lt;small/&gt;Jakarta Commons Logging is copyrighted by the Apache Software Foundation&lt;small/&gt;.
+    	</bottom>
     </javadoc>
   </target>