summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2009-06-18 00:41:28 +0000
committerKenneth Russel <[email protected]>2009-06-18 00:41:28 +0000
commite3611d9aa4e8aefb229196087f550a1c346deee9 (patch)
treea4927833b82b2150fdaa3b211f4a26659739987d
parent023ac9d25b0593e5a327f35685fcae8a62afa10d (diff)
Fixes for javadoc targets
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1982 232f8b59-042b-4e1e-8c03-345bb8c30851
-rw-r--r--make/build.xml8
-rwxr-xr-xsrc/jogl/classes/com/sun/opengl/util/packrect/package.html2
2 files changed, 9 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index 91d9a97c4..28d998575 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -25,7 +25,8 @@
<property name="newt.build.xml" value="${newt.make.dir}/build-newt.xml" />
<property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" />
- <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes;${build}/newt/gensrc/classes" />
+ <!-- No generated classes for Newt at the present time -->
+ <property name="all.genj.path" value="${build}/nativewindow/gensrc/classes;${build}/jogl/gensrc/classes" />
<!-- The javadoc dirs. -->
<property name="javadoc" value="${project.root}/javadoc_public" />
@@ -50,6 +51,7 @@
<property name="java.excludes.javadoc.packagenames" value="com.sun.opengl.impl.gl2.fixme.*,com.sun.javafx.audio.windows.waveout.TestSpatialization"/>
<property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
+ <property name="gluegen.jar" value="../../gluegen/${rootrel.build}/gluegen.jar" />
<property name="gluegen-rt.jar" value="../../gluegen/${rootrel.build}/gluegen-rt.jar" />
<property name="nativewindow.all.jar" value="../${rootrel.build}/nativewindow/nativewindow.all.jar" />
<property name="jogl.all.jar" value="../${rootrel.build}/jogl/jogl.all.jar" />
@@ -179,6 +181,7 @@
bottom="${javadoc.bottom}" >
<classpath refid="all.classpath"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+ <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
</javadoc>
</target>
@@ -194,6 +197,7 @@
<classpath refid="all.classpath"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
<link offline="false" href="${javadoc.nw.spec}" />
+ <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
</javadoc>
</target>
@@ -208,6 +212,7 @@
bottom="${javadoc.bottom}" >
<classpath refid="all.classpath"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+ <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
</javadoc>
</target>
@@ -222,6 +227,7 @@
bottom="${javadoc.bottom}" >
<classpath refid="all.classpath"/>
<link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" />
+ <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
</javadoc>
</target>
diff --git a/src/jogl/classes/com/sun/opengl/util/packrect/package.html b/src/jogl/classes/com/sun/opengl/util/packrect/package.html
index 7f2522244..c1c5db477 100755
--- a/src/jogl/classes/com/sun/opengl/util/packrect/package.html
+++ b/src/jogl/classes/com/sun/opengl/util/packrect/package.html
@@ -1,3 +1,4 @@
+<BODY>
This package implements a rectangle packing algorithm suitable for
tracking the placement of multiple rectangles inside a larger one. It
is useful for cases such as placing the contents of multiple windows
@@ -5,3 +6,4 @@ on a larger backing store texture for a compositing window manager;
placing multiple rasterized strings in a texture map for quick
rendering to the screen; and many other situations where it is useful
to carve up a larger texture into smaller pieces dynamically. <P>
+</BODY>