From 6e68a08f3df48e3746cc53219a30ee167c9f0feb Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 22 Feb 2007 20:28:07 +0000
Subject: [PATCH] [175157] force building javadoc with Java5-64bit on
 build.eclipse.org

---
 rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml | 4 +++-
 rse/doc/org.eclipse.dstore.doc.isv/options.txt  | 1 +
 rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml    | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
index 4701988a4a3..bcf91358cb5 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
@@ -94,6 +94,7 @@
 		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
 		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
 		<available file="/usr/bin/javadoc" property="javadoc" value="/usr/bin/javadoc" />
+		<available file="/shared/common/ibm-java2-ppc64-50/bin/javadoc" property="javadoc" value="/shared/common/ibm-java2-ppc64-50/bin/javadoc" />
 	</target>
 
 	<target name="generateJavadoc" depends="getJavadocPath,extractLinks,computeClasspath" if="javadoc">
@@ -118,9 +119,10 @@
 
 		<echo message="sep = ${argsListDelimiter}"/>
 		<echo message="javadoc = ${javadoc}"/>
-		<exec dir="." executable="${javadoc}" output="temp.bin.log">
+		<exec dir="." executable="${javadoc}" output="temp.bin.log" resultproperty="javadocResult">
 			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
 		</exec>
+		<echo message="javadoc result = ${javadocResult}"/>
 	</target>
 
 </project>
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/options.txt b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
index fcb8f7dbd43..35dc09f5227 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
@@ -1,4 +1,5 @@
 -charset "iso-8859-1"
+-source 1.4
 -sourcepath "../org.eclipse.dstore.core/src
 ;../org.eclipse.dstore.extra/src"
 -d reference/api
diff --git a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
index bba4a62cfd5..8c82e8e4327 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
@@ -132,9 +132,10 @@
 
 		<echo message="sep = ${argsListDelimiter}"/>
 		<echo message="javadoc = ${javadoc}"/>
-		<exec dir="." executable="${javadoc}" output="temp.bin.log">
+		<exec dir="." executable="${javadoc}" output="temp.bin.log" resultproperty="javadocResult">
 			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
 		</exec>
+		<echo message="javadoc result = ${javadocResult}"/>
 	</target>
 
 </project>