aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--make/build.xml27
-rw-r--r--make/scripts/tests.bat4
-rw-r--r--make/scripts/tests.sh4
-rw-r--r--www/index.html4
4 files changed, 22 insertions, 17 deletions
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>
diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat
index 1f3014660..4910fdf39 100644
--- a/make/scripts/tests.bat
+++ b/make/scripts/tests.bat
@@ -1,5 +1,5 @@
+scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01CORE
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT -time 30000
-REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01CORE
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT
@@ -10,7 +10,7 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParentin
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows01NEWT
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT
-scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot
+REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE
REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 3df37e330..2646fc0c6 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -46,7 +46,7 @@ function testawt() {
#
# newt (testnoawt and testawt)
#
-#testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
+testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
#testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT
#testawt com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT
@@ -55,7 +55,7 @@ function testawt() {
#testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT
#testnoawt com.jogamp.test.junit.newt.TestScreenMode01NEWT
#testnoawt com.jogamp.test.junit.newt.TestScreenMode02NEWT
-testawt com.jogamp.test.junit.newt.TestGLWindows01NEWT -time 1000000
+#testawt com.jogamp.test.junit.newt.TestGLWindows01NEWT -time 1000000
#testawt -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT
#testawt com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated
diff --git a/www/index.html b/www/index.html
index 90cd159ff..ddeec484c 100644
--- a/www/index.html
+++ b/www/index.html
@@ -22,14 +22,14 @@
<li><a href="../../wiki/">Wiki</a></li>
<li><a href="../../blog/">Blogs</a></li>
<li><a href="../../forum.html">Forums</a></li>
- <li><a href="../../deployment/jogl-next/javadoc_public/">JavaDoc</a></li>
+ <li><a href="../../deployment/jogl-next/javadoc/">JavaDoc</a></li>
</ul>
</div>
<div id="main">
<div id="sidebar">
<h3>Useful Links</h3>
<ul>
- <li><a href="../../deployment/jogl-next/javadoc_public/">JOGL JavaDoc</a></li>
+ <li><a href="../../deployment/jogl-next/javadoc/">JOGL JavaDoc</a></li>
<li><a href="../../wiki/index.php/Jogl_Overview">Project Overview</a></li>
<li><a href="../doc/HowToBuild.html">Building JOGL</a></li>
<li><a href="../doc/deployment/JOGL-DEPLOYMENT.html">Deploying JOGL</a></li>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 13:28:13 +0000