svn commit: r348203 - /db/derby/code/trunk/build.xml

[da...@apache.org]

Author: davidvc
Date: Tue Nov 22 10:24:19 2005
New Revision: 348203

URL: http://svn.apache.org/viewcvs?rev=348203&view=rev
Log:
Patch for DERBY-587, contributed by Rick Hillegas

"The original patch broke javadoc generation because the 1.4 javadoc machinery doesn't understand the 1.6 signatures which contain generics. I have attached bug587_javadoc.diff to fix this regression. Thanks to Dyre for tripping across the problem."



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

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=348203&r1=348202&r2=348203&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Nov 22 10:24:19 2005
@@ -603,12 +603,36 @@
     <delete dir="${out.javadoc.dir}/engine"/>
     <mkdir dir="${out.javadoc.dir}/engine"/>
 
+    <delete dir="${out.javadoc.dir}/sourcedir"/>
+    <mkdir dir="${out.javadoc.dir}/sourcedir"/>
+
+    <!-- engine files -->
+    <copy todir="${out.javadoc.dir}/sourcedir">
+      <fileset dir="${derby.engine.src.dir}"
+               excludesfile="${javadoctools.dir}/derbydocs_exclusions.ant"/>
+    </copy>
+    <!-- client files -->
+    <copy todir="${out.javadoc.dir}/sourcedir">
+      <fileset dir="${derby.client.src.dir}"
+               excludesfile="${javadoctools.dir}/derbydocs_exclusions.ant"/>
+    </copy>
+    <!-- drda files -->
+    <copy todir="${out.javadoc.dir}/sourcedir">
+      <fileset dir="${derby.drda.src.dir}"
+               excludesfile="${javadoctools.dir}/derbydocs_exclusions.ant"/>
+    </copy>
+    <!-- tools files -->
+    <copy todir="${out.javadoc.dir}/sourcedir">
+      <fileset dir="${derby.tools.src.dir}"
+               excludesfile="${javadoctools.dir}/derbydocs_exclusions.ant"/>
+    </copy>
+
     <javadoc
         additionalparam="-J-mx320M"
         packagenames="org.*"
         access="private"
         breakiterator="yes"
-        sourcepath="${derby.engine.src.dir};${derby.client.src.dir};${derby.drda.src.dir};${derby.tools.src.dir}"
+        sourcepath="${out.javadoc.dir}/sourcedir"
         classpath="${basedir}/classes;${java14compile.classpath};${jars.extras};${osgi}"
         destdir="${out.javadoc.dir}/engine"
         windowtitle="Apache Derby V${major}.${minor} Engine Documentation"
@@ -627,6 +651,8 @@
         <taglet name="org.apache.derbyBuild.javadoc.EndFormatTaglet" 
                 path="${basedir}/classes"/>
     </javadoc>
+
+    <delete dir="${out.javadoc.dir}/sourcedir"/>
 
   </target>