summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-04-13 09:15:46 (EDT)
committer pelder2006-04-13 09:15:46 (EDT)
commit34509ad48a6d483c8eddf88cd1c2e25c27b1e77f (patch)
tree20f2ba38a542fbcbf5e60a019031f7e22d574a52
parent82c63b493633182d73749cbc45463b33f5d8265c (diff)
downloadorg.eclipse.jet-34509ad48a6d483c8eddf88cd1c2e25c27b1e77f.zip
org.eclipse.jet-34509ad48a6d483c8eddf88cd1c2e25c27b1e77f.tar.gz
org.eclipse.jet-34509ad48a6d483c8eddf88cd1c2e25c27b1e77f.tar.bz2
[136414] Give up on J9 (Sun JVM then chokes), try always force Sun JVM.
-rw-r--r--doc/org.eclipse.jet.doc/build/antJavadoc.sh4
-rw-r--r--doc/org.eclipse.jet.doc/build/javadoc.xml.template3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/org.eclipse.jet.doc/build/antJavadoc.sh b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
index 2dcc13a..04a8fa3 100644
--- a/doc/org.eclipse.jet.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
@@ -1,7 +1,9 @@
#!/bin/sh
if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/sun-java2-5.0; fi
+#if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/sun-java2-5.0; fi
+# Always use 1.5 JVM for Javadoc, 1.4 one has memory problems
+export JAVA_HOME=/opt/sun-java2-5.0
export PATH=${PATH}:${ANT_HOME}/bin
# The current direcotry
diff --git a/doc/org.eclipse.jet.doc/build/javadoc.xml.template b/doc/org.eclipse.jet.doc/build/javadoc.xml.template
index d63e4f7..a6e08ce 100644
--- a/doc/org.eclipse.jet.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.jet.doc/build/javadoc.xml.template
@@ -50,8 +50,7 @@
splitindex="true"
use="true"
version="true">
- <arg value="-J-Xj9"/>
- <arg value="-J-Xmx1280m"/>
+ <arg value="-J-Xmx1024m"/>
<link offline="true" href="http://java.sun.com/j2se/1.4/docs/api/" packagelistLoc="${javaHome}/docs/api/"/>
<!-- TODO Enable link to platform documentation -->