db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r984474 - in /db/derby/code/branches/10.2: build.xml tools/javadoc/jdbc4list
Date Wed, 11 Aug 2010 17:11:15 GMT
Author: myrnavl
Date: Wed Aug 11 17:11:15 2010
New Revision: 984474

URL: http://svn.apache.org/viewvc?rev=984474&view=rev
Log:
DERBY-4761 - javadoc warnings for 10.3 with jdk 1.6 set
  backport of revision 984277 from 10.3
  command: svn merge -c 984277 https://svn.apache.org/repos/asf/db/derby/code/branches/10.3

Added:
    db/derby/code/branches/10.2/tools/javadoc/jdbc4list
      - copied unchanged from r984277, db/derby/code/branches/10.3/tools/javadoc/jdbc4list
Modified:
    db/derby/code/branches/10.2/build.xml

Modified: db/derby/code/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/build.xml?rev=984474&r1=984473&r2=984474&view=diff
==============================================================================
--- db/derby/code/branches/10.2/build.xml (original)
+++ db/derby/code/branches/10.2/build.xml Wed Aug 11 17:11:15 2010
@@ -776,10 +776,51 @@
       <link href="."/>
     </javadoc>
 
+    <antcall target="dojavadoc16"/>
+
     <delete dir="${javadoc.temp.dir}"/>
 
   </target>
 
+  <target name="dojavadoc16" if="jdk16">
+    <javadoc
+        executable="${javadoc.tool}"
+        additionalparam="-J-mx320M"
+        packagenames="org.*"
+        access="private"
+        breakiterator="yes"
+        useexternalfile="yes"
+        classpath="${out.dir};${java14compile.classpath};${jars.extras};${osgi}"
+        destdir="${out.javadoc.dir}/engine"
+        windowtitle="Apache Derby V${major}.${minor} Internals"
+        doctitle="Apache Derby V${major}.${minor} Internals"
+        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="1.5">
+        <taglet name="org.apache.derbyBuild.javadoc.FormatIdTaglet" 
+                path="${basedir}/classes"/>
+        <taglet name="org.apache.derbyBuild.javadoc.PurposeTaglet" 
+                path="${basedir}/classes"/>
+        <taglet name="org.apache.derbyBuild.javadoc.UpgradeTaglet" 
+                path="${basedir}/classes"/>
+        <taglet name="org.apache.derbyBuild.javadoc.DiskLayoutTaglet" 
+                path="${basedir}/classes"/>
+        <taglet name="org.apache.derbyBuild.javadoc.EndFormatTaglet" 
+                path="${basedir}/classes"/>
+      <fileset dir="${derby.engine.src.dir}"
+               includes="**/*40.java,org/apache/derby/impl/services/locks/ConcurrentLockSet.java"
+               />
+      <fileset dir="${derby.client.src.dir}"
+               includes="**/*40.java"
+               />
+      <fileset dir="${derby.engine.src.dir}"
+               excludesfile="${javadoc.exclusions}"/>
+      <fileset dir="${derby.client.src.dir}"
+               excludesfile="${javadoc.exclusions}"/>
+      <link href="."/>
+    </javadoc>
+  </target>
+
   <!--
      Optionally include extra JDBC4 support in public API.
   -->
@@ -834,6 +875,9 @@
        <filelist dir="${javadoctools.dir}" 
          files="${more_exclusions}"
        />
+       <filelist dir="${javadoctools.dir}" 
+         files="jdbc4list"
+       />
     </concat>
   </target>
 



Mime
View raw message