db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1445196 - in /db/derby/code/trunk: build.xml tools/javadoc/derbydocs_exclusions.ant tools/javadoc/derbydocs_java8_exclusions.ant
Date Tue, 12 Feb 2013 15:30:43 GMT
Author: rhillegas
Date: Tue Feb 12 15:30:43 2013
New Revision: 1445196

URL: http://svn.apache.org/r1445196
Log:
DERBY-6000: Fix javadoc on Java 7.

Added:
    db/derby/code/trunk/tools/javadoc/derbydocs_java8_exclusions.ant   (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/tools/javadoc/derbydocs_exclusions.ant

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1445196&r1=1445195&r2=1445196&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Feb 12 15:30:43 2013
@@ -1221,6 +1221,7 @@
     <antcall target="exclude-from-javadoc">
       <param name="more_exclusions" value="derbydocs_exclusions.ant"/>
     </antcall>
+    <antcall target="exclude-java8-from-javadoc"/>
 
     <javadoc
         additionalparam="-J-mx500M"
@@ -1295,6 +1296,15 @@
     </concat>
   </target>
 
+  <!--
+     Exclude Java 8 support from the javadoc if using Java 7 or earlier.
+  -->
+  <target name="exclude-java8-from-javadoc" depends="checkVMLevel" unless="vmLevelIsAtLeast1.8">
+    <antcall target="exclude-from-javadoc">
+      <param name="more_exclusions" value="derbydocs_java8_exclusions.ant"/>
+    </antcall>
+  </target>
+
   <target name="toolsdocs">
 
     <delete dir="${out.javadoc.dir}/tools"/>
@@ -1353,6 +1363,12 @@
   </target>
 
   <target name="testingdocs" depends="initjars">
+
+    <antcall target="exclude-from-javadoc">
+      <param name="more_exclusions" value="derbydocs_exclusions.ant"/>
+    </antcall>
+    <antcall target="exclude-java8-from-javadoc"/>
+
     <javadoc
        additionalparam="-J-mx500M"
        packagenames="org.*"
@@ -1366,8 +1382,11 @@
        Footer="${javadoc.Footer}"
        bottom="Apache Derby V${major}.${minor} Internals - &lt;i&gt;Copyright &amp;copy;
2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.&lt;/i&gt;"
        source="1.5"
-       sourcepath="${derby.testing.src.dir}"
-     />
+     >
+      <fileset dir="${derby.testing.src.dir}"
+               excludesfile="${javadoc.exclusions}"/>
+    </javadoc>
+
   </target>
 
   <target name="cleandocs">

Modified: db/derby/code/trunk/tools/javadoc/derbydocs_exclusions.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/derbydocs_exclusions.ant?rev=1445196&r1=1445195&r2=1445196&view=diff
==============================================================================
--- db/derby/code/trunk/tools/javadoc/derbydocs_exclusions.ant (original)
+++ db/derby/code/trunk/tools/javadoc/derbydocs_exclusions.ant Tue Feb 12 15:30:43 2013
@@ -28,14 +28,28 @@
 # Please do not add whitespace in front of class names.
 # Blank lines and comments are allowed.
 
-**/build.xml
-**/messages*.xml
-**/*.dtd
-**/*.properties
+**/*.a*
+**/*.b*
+**/*.c*
+**/*.d*
+**/*.e*
+**/*.g*
+**/*.h*
+**/*.i*
+**/*.k*
+**/*.m*
+**/*.n*
+**/*.o*
+**/*.p*
+**/*.jar
 **/*.jj
-**/*.tmpl
-**/package.html
-**/*.rej
-**/*.orig
-**/*.policy
-**/*.xsl
+**/*.r*
+**/*.s*
+**/*.t*
+**/*.u*
+**/*.v*
+**/*.x*
+
+**/readme
+**/README*
+**/shortbanner

Added: db/derby/code/trunk/tools/javadoc/derbydocs_java8_exclusions.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/derbydocs_java8_exclusions.ant?rev=1445196&view=auto
==============================================================================
--- db/derby/code/trunk/tools/javadoc/derbydocs_java8_exclusions.ant (added)
+++ db/derby/code/trunk/tools/javadoc/derbydocs_java8_exclusions.ant Tue Feb 12 15:30:43 2013
@@ -0,0 +1,3 @@
+# exclude these files if you are building javadoc on Java 7 or earlier
+
+**/*42.java

Propchange: db/derby/code/trunk/tools/javadoc/derbydocs_java8_exclusions.ant
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message