db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r734711 - /db/derby/code/trunk/build.xml
Date Thu, 15 Jan 2009 14:00:04 GMT
Author: rhillegas
Date: Thu Jan 15 06:00:04 2009
New Revision: 734711

URL: http://svn.apache.org/viewvc?rev=734711&view=rev
Log:
DERBY-4017: Removed deprecated jdk16 variable from javadoc-building targets.

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=734711&r1=734710&r2=734711&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Jan 15 06:00:04 2009
@@ -184,7 +184,7 @@
     <delete file="${out.dir}/org/apache/derby/info/dnc.properties"/>
   </target>
 
-  <target name="setCompilerProperties" unless="dontAutosetProps"
+  <target name="setCompilerProperties" unless="compilerPropsAlreadySet"
           description="Set the ant variables which identify the compiler classpaths. Remove
the autosetProps logic when this target becomes mandatory."
           depends="prebuild">
 
@@ -239,8 +239,10 @@
     -->
     <property name="compile.classpath" value="${jsr169compile.classpath}"/>
 
+    <property name="compilerPropsAlreadySet" value="true"/>
     <antcall target="printCompilerProperties"> <param name="checkEvent" value="After
setting properties: "/> </antcall>
 
+
   </target>
 
   <target name="setInitialProperties" if="dontAutosetProps"
@@ -259,6 +261,7 @@
 
   <target name="printCompilerProperties" if="printCompilerProperties">
 
+    <echo message="${checkEvent} compilerPropsAlreadySet = ${compilerPropsAlreadySet}"/>
     <echo message="${checkEvent} compilerLevel16 = ${compilerLevel16}"/>
     <echo message="${checkEvent} jsr169compile.classpath = ${jsr169compile.classpath}"/>
     <echo message="${checkEvent} j14lib = ${j14lib}"/>
@@ -830,23 +833,11 @@
   <property name="javadoc.temp.dir" value="${out.javadoc.dir}/temp"/>
   <property name="javadoc.exclusions" value="${javadoc.temp.dir}/javadoc_exclusions"/>
   <property name="javadoc.inclusions" value="${javadoc.temp.dir}/javadoc_inclusions"/>
-  <property name="javadoc.tool.jdk14" value="${java.home}/../bin/javadoc"/>
-  <property name="javadoc.tool.jdk16" value="${jdk16}/bin/javadoc"/>
 
   <target name="javadoc"
-    depends="init-javadoc-tool,init,initjars,publishedapi,derbydocs,toolsdocs,grammardocs,testingdocs"/>
-
-  <target name="init-javadoc-tool" depends="init-javadoc-not-jdk16,init-javadoc-jdk16"/>
-
-  <target name="init-javadoc-not-jdk16" unless="jdk16">
-    <property name="javadoc.tool" value="${javadoc.tool.jdk14}"/>
-  </target>
+    depends="init,initjars,publishedapi,derbydocs,toolsdocs,grammardocs,testingdocs"/>
 
-  <target name="init-javadoc-jdk16" if="jdk16">
-    <property name="javadoc.tool" value="${javadoc.tool.jdk16}"/>
-  </target>
-
-  <target name="publishedapi" depends="init-javadoc-tool,initjars">
+  <target name="publishedapi" depends="initjars">
  
     <tstamp>
       <format 
@@ -873,7 +864,7 @@
   <target name="public-jdbc3-api">
  
     <antcall target="publishedapi-workhorse">
-      <param name="javadocTool" value="${javadoc.tool.jdk14}"/>
+      <param name="bootClasspath" value="${java14compile.classpath}"/>
       <param name="extraApi" value="publishedapi_jdbc3.ant"/>
     </antcall>
 
@@ -882,7 +873,7 @@
   <!--
     Build the jdbc4 public api. Called by publishedapi target.
   -->
-  <target name="public-jdbc4-api" if="jdk16">
+  <target name="public-jdbc4-api">
 
     <move todir="${out.javadoc.dir}/jdbc3">
       <fileset dir="${public.api.dir}"/>
@@ -891,8 +882,8 @@
     <mkdir dir="${public.api.dir}"/>
 
     <antcall target="publishedapi-workhorse">
-      <param name="javadocTool" value="${javadoc.tool.jdk16}"/>
-      <param name="extraApi" value="publishedapi_jdbc4.ant"/>
+     <param name="bootClasspath" value="${java16compile.classpath}"/>
+     <param name="extraApi" value="publishedapi_jdbc4.ant"/>
     </antcall>
 
     <move todir="${out.javadoc.dir}/jdbc4">
@@ -915,8 +906,8 @@
     This target is called twice, once to build the JDBC3 public api
     and then a second time to build the JDBC4 api.
 
-    javadocTool  Which javadoc tool to use: jdk14 or jdk16 tool
-    extraApi     Extra files to include in the public api.
+    bootClasspath    Sensitive to JDBC level.
+    extraApi         Extra files to include in the public api.
   -->
   <target name="publishedapi-workhorse" depends="initjars">
  
@@ -930,8 +921,8 @@
     </antcall>
 
     <javadoc sourcepath="${out.javadoc.dir}/sourcedir"
-             executable="${javadocTool}"
-             classpath="${compile.classpath};${osgi};${servlet24};${out.dir}"
+             bootclasspath="${bootClasspath}"
+             classpath="${bootClasspath};${osgi};${servlet24};${out.dir}"
              breakiterator="true"
              destdir="${public.api.dir}"
     	     Overview="${basedir}/published_api_overview.html"
@@ -961,7 +952,7 @@
   </target>
 
 
-  <target name="derbydocs" depends="init-javadoc-tool,initjars">
+  <target name="derbydocs" depends="initjars">
 
     <delete dir="${out.javadoc.dir}/engine"/>
     <mkdir dir="${out.javadoc.dir}/engine"/>
@@ -977,16 +968,14 @@
     <antcall target="exclude-from-javadoc">
       <param name="more_exclusions" value="derbydocs_exclusions.ant"/>
     </antcall>
-    <antcall target="derbydocs-not-jdk16-excludes"/>
 
     <javadoc
-        executable="${javadoc.tool}"
         additionalparam="-J-mx320M"
         packagenames="org.*"
         access="private"
         breakiterator="yes"
         useexternalfile="yes"
-        classpath="${out.dir};${java14compile.classpath};${jars.extras};${osgi}"
+        classpath="${out.dir};${java16compile.classpath};${jars.extras};${osgi}:${xalan}:${serializer}"
         destdir="${out.javadoc.dir}/engine"
         windowtitle="Apache Derby V${major}.${minor} Internals"
         doctitle="Apache Derby V${major}.${minor} Internals"
@@ -1020,18 +1009,6 @@
   </target>
 
   <!--
-     Optionally include extra JDBC4 support in public API.
-  -->
-  <target name="publishedapi-jdk16-includes" if="jdk16">
-
-    <!--  Include extra JDBC4 support.  -->
-    <antcall target="include-in-javadoc">
-      <param name="more_inclusions" value="publishedapi_jdbc4.ant"/>
-    </antcall>
-
-  </target>
-
-  <!--
      Include more files in the javadoc. Successive calls to this
      target append more inclusions to the master file that tells
 	 javadoc which files to notice.
@@ -1049,17 +1026,6 @@
   </target>
 
   <!--
-     Optionally exclude the JDBC4 classes, which choke the jdk14 javadoc tool.
-  -->
-  <target name="derbydocs-not-jdk16-excludes" unless="jdk16">
-
-    <antcall target="exclude-from-javadoc">
-      <param name="more_exclusions" value="derbydocs_jdbc4_exclusions.ant"/>
-    </antcall>
-
-  </target>
-
-  <!--
      Exclude more files from the javadoc. Successive calls to this
      target append more exclusions to the master file that tells
 	 javadoc which files to ignore.
@@ -1088,13 +1054,12 @@
 
   </target>
 
-  <target name="demodocs" depends="init-javadoc-tool,init">
+  <target name="demodocs" depends="init">
 
     <delete dir="${out.javadoc.dir}/demo"/>
     <mkdir dir="${out.javadoc.dir}/demo"/>
 
     <javadoc
-        executable="${javadoc.tool}"
         additionalparam="-J-mx320M"
         packagenames="org.apache.derbyDemo.vtis.*"
         access="private"
@@ -1134,39 +1099,22 @@
 
   </target>
 
-  <target name="testingdocs" depends="testing-javadoc-16,testing-javadoc-14"/>
-  
-  <target name="testing-javadoc-16" if="jdk16">
-    <antcall target="testing-javadoc">
-      <param name="derbyTesting.javadoc.excludes" value=""/>
-      <param name="derbyTesting.javadoc.vmlevel" value="1.6"/>
-    </antcall>
-  </target>
-
-  <target name="testing-javadoc-14" unless="jdk16">
-    <antcall target="testing-javadoc">
-      <param name="derbyTesting.javadoc.excludes"
-             value="org.apache.derbyTesting.functionTests.tests.jdbc4"/>
-      <param name="derbyTesting.javadoc.vmlevel" value="1.4"/>
-    </antcall>
-  </target>
-
-  <target name="testing-javadoc" depends="init-javadoc-tool,initjars">
+  <target name="testingdocs" depends="initjars">
     <javadoc
-       executable="${javadoc.tool}"
        additionalparam="-J-mx320M"
        packagenames="org.*"
        access="private"
        breakiterator="yes"
-       classpath="${out.dir};${java14compile.classpath};${jars.extras};${osgi};${junit}"
+       bootclasspath="${java16compile.classpath}"
+       classpath="${out.dir};${java16compile.classpath};${jars.extras};${osgi};${junit}"
        destdir="${out.javadoc.dir}/testing"
        windowtitle="Apache Derby V${major}.${minor} Test Javadoc"
        doctitle="Apache Derby V${major}.${minor} Test Javadoc"
        Footer="${javadoc.Footer}"
        bottom="Apache Derby V${major}.${minor} Internals - &lt;i&gt;Copyright &amp;copy;
2004,2008 The Apache Software Foundation. All Rights Reserved.&lt;/i&gt;"
-       source="${derbyTesting.javadoc.vmlevel}"
+       source="1.5"
        sourcepath="${derby.testing.src.dir}"
-       excludepackagenames="${derbyTesting.javadoc.excludes}"/>
+     />
   </target>
 
   <target name="cleandocs">



Mime
View raw message