summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-05-24 10:05:04 (EDT)
committerpelder2006-05-24 10:05:04 (EDT)
commitcd981d3bb8a803d74c56ea0b9f4277b116482a1e (patch)
tree85b362c7081233764e87f5e1fd4980b4be3e2731
parent75968e4219657e3fe37ef965869442978739149f (diff)
downloadorg.eclipse.jet-cd981d3bb8a803d74c56ea0b9f4277b116482a1e.zip
org.eclipse.jet-cd981d3bb8a803d74c56ea0b9f4277b116482a1e.tar.gz
org.eclipse.jet-cd981d3bb8a803d74c56ea0b9f4277b116482a1e.tar.bz2
[143440] Ensure indexing doclet get compiled with Java 1.4
-rw-r--r--doc/org.eclipse.jet.doc/build/antJavadoc.sh1
-rw-r--r--doc/org.eclipse.jet.doc/build/javadoc.xml.template3
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/org.eclipse.jet.doc/build/antJavadoc.sh b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
index 7d1d68d..a5a79b0 100644
--- a/doc/org.eclipse.jet.doc/build/antJavadoc.sh
+++ b/doc/org.eclipse.jet.doc/build/antJavadoc.sh
@@ -15,6 +15,7 @@ javadocExclusions=$javadocExclusions" <exclude name=\"**/antsrc/org/eclipse/jet/
# special for JET only: always use 1.5 JVM for Javadoc, 1.4 one has memory problems
export JAVA_HOME=/opt/sun-java2-5.0
+export JAVA_HOME_1_4=/opt/ibm-java2-1.4
# END CUSTOMIZATIONS
diff --git a/doc/org.eclipse.jet.doc/build/javadoc.xml.template b/doc/org.eclipse.jet.doc/build/javadoc.xml.template
index 946f9d6..3916da9 100644
--- a/doc/org.eclipse.jet.doc/build/javadoc.xml.template
+++ b/doc/org.eclipse.jet.doc/build/javadoc.xml.template
@@ -13,6 +13,7 @@
<property environment="env"/>
<property name="javaHome" value="${env.JAVA_HOME}"/>
+ <property name="javaHome1.4" value="${env.JAVA_HOME_1_4}"/>
<property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
<available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
@@ -30,7 +31,7 @@
<move todir="."><fileset dir="org.eclipse.emf.releng.build/org.eclipse.emf.build/src"/></move>
<!-- requires JDK1.4 for compilation -->
- <javac srcdir="org/eclipse/emf/build/doclet" classpath=".:${java.home}/../lib/tools.jar" failonerror="true"/>
+ <javac srcdir="org/eclipse/emf/build/doclet" classpath=".:${javaHome1.4}/lib/tools.jar" failonerror="true"/>
<javadoc
destdir="${destDir}"
classpath="${classpath}"