From 7dce462b56f1e77e3cc2b68cb72c27a549c53f91 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 9 Nov 2010 11:47:58 +0100
Subject: JavaDoc: Use GlueGen offline link, javadoc_public -> javadoc

---
 make/build.xml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index fc2961cb0..54ac04432 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -5,7 +5,8 @@
 
     <target name="init" depends="common.init">
         <!-- The javadoc dirs. -->
-        <property name="javadoc" value="${build}/javadoc_public" />
+        <property name="javadoc" value="${build}/javadoc" />
+        <property name="gluegen.link" value="http://jogamp.org/deployment/gluegen-next/javadoc/" />
         <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
 
@@ -165,16 +166,17 @@
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  source="1.4"
-                 maxmemory="512m"
+                 maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
-            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <link offline="true" href="${javadoc.link}" packagelistLoc="../../gluegen/make/142-packages" />
+            <link offline="true" href="${gluegen.link}" packagelistLoc="../../gluegen/make/gluegen-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
-        <zip destfile="${build}/javadoc_public.zip"
+        <zip destfile="${build}/javadoc.zip"
              basedir="${build}"
-             includes="javadoc_public/**" />
+             includes="javadoc/**" />
     </target>
 
     <target name="javadoc.jogl.spec" depends="init,javadoc.nw.spec">
@@ -185,10 +187,11 @@
                  destdir="${javadoc.spec}" windowtitle="${javadoc.spec.windowtitle}"
                  overview="${javadoc.overview}"
                  source="1.4"
-                 maxmemory="512m"
+                 maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
-            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <link offline="true" href="${javadoc.link}" packagelistLoc="../../gluegen/make/142-packages" />
+            <link offline="true" href="${gluegen.link}" packagelistLoc="../../gluegen/make/gluegen-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <link offline="false" href="${javadoc.nw.spec}" />
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
@@ -206,10 +209,11 @@
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  source="1.4"
-                 maxmemory="512m"
+                 maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
-            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <link offline="true" href="${javadoc.link}" packagelistLoc="../../gluegen/make/142-packages" />
+            <link offline="true" href="${gluegen.link}" packagelistLoc="../../gluegen/make/gluegen-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
@@ -226,10 +230,11 @@
                  destdir="${javadoc.nw.spec}" windowtitle="${javadoc.nw.spec.windowtitle}"
                  overview="${javadoc.nw.overview}"
                  source="1.4"
-                 maxmemory="512m"
+                 maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
-            <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+            <link offline="true" href="${javadoc.link}" packagelistLoc="../../gluegen/make/142-packages" />
+            <link offline="true" href="${gluegen.link}" packagelistLoc="../../gluegen/make/gluegen-packages" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
-- 
cgit v1.2.3