[jboss-remoting-commits] JBoss Remoting SVN: r3997 - remoting3/trunk.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2008-04-16 08:52:42 -0400 (Wed, 16 Apr 2008)
New Revision: 3997

Modified:
   remoting3/trunk/build.xml
Log:
Fix javadoc target; add javadoc to all; fix tools target to just look for needed classes, but still target 1.5

Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml	2008-04-16 02:36:54 UTC (rev 3996)
+++ remoting3/trunk/build.xml	2008-04-16 12:52:42 UTC (rev 3997)
@@ -959,19 +959,16 @@
                 <exclude name="**/.*"/>
             </srcfiles>
         </uptodate>
-        <condition property="tools.compiler.newenough">
-            <or>
-                <contains string="${java.version}" substring="1.6."/>
-                <contains string="${java.version}" substring="1.7."/>
-            </or>
+        <condition property="tools.supported">
+            <available classname="java.io.Console"/>
         </condition>
     </target>
 
-    <target name="tools.compile" depends="tools.compile.depcheck" unless="tools.compile.uptodate" if="tools.compiler.newenough">
+    <target name="tools.compile" depends="tools.compile.depcheck" unless="tools.compile.uptodate" if="tools.supported">
         <mkdir dir="tools/target/main/classes"/>
         <javac
-                source="1.6"
-                target="1.6"
+                source="${javac.source}"
+                target="${javac.target}"
                 srcdir="tools/src/main/java"
                 destdir="tools/target/main/classes"
                 debug="true">
@@ -1228,7 +1225,7 @@
     <!-- JAVADOCS                                       -->
     <!-- ============================================== -->
 
-    <target name="api-javadoc" depends="api,core,log-jul,standalone,util">
+    <target name="api-javadoc" depends="api,core,jrpp,log-jul,standalone,util">
         <delete dir="api/target/main/docs"/>
         <mkdir dir="api/target/main/docs"/>
         <javadoc destdir="api/target/main/docs" author="false" version="false" use="false" windowtitle="JBoss Remoting API">
@@ -1241,6 +1238,7 @@
             <classpath>
                 <path refid="log-jul.classpath"/>
                 <path refid="core.classpath"/>
+                <path refid="jrpp.classpath"/>
             </classpath>
         </javadoc>
     </target>
@@ -1282,7 +1280,7 @@
 
     <!-- all: These should be the last targets in the file -->
 
-    <target name="all" description="Build everything" depends="all-core,all-http,all-jrpp,all-log,all-jars"/>
+    <target name="all" description="Build everything" depends="all-core,all-http,all-jrpp,all-log,all-jars,api-javadoc"/>
 
     <target name="clean" description="Clean out all build files" depends="clean-core,clean-http,clean-jrpp,clean-log"/>