From 078d44db9d2d5d851080bf4084d79abaff4cd8d4 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 29 Nov 2006 17:43:36 +0000 Subject: [PATCH] Dont use 64-bit jvm on build.eclipse.org after SLES10 upgrade --- releng/org.eclipse.rse.build/bin/batch_sign.sh | 4 ++-- releng/org.eclipse.rse.build/bin/doit_ibuild.sh | 4 ++-- releng/org.eclipse.rse.build/bin/doit_irsbuild.sh | 4 ++-- releng/org.eclipse.rse.build/bin/doit_nightly.sh | 4 ++-- releng/org.eclipse.rse.build/bin/doit_sbuild.sh | 4 ++-- releng/org.eclipse.rse.build/bootstrap.sh | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh index 8b69efcab71..b091bd336bf 100755 --- a/releng/org.eclipse.rse.build/bin/batch_sign.sh +++ b/releng/org.eclipse.rse.build/bin/batch_sign.sh @@ -23,8 +23,8 @@ umask 2 #Use Java5 on build.eclipse.org #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH -export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH +#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH +export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH curdir=`pwd` diff --git a/releng/org.eclipse.rse.build/bin/doit_ibuild.sh b/releng/org.eclipse.rse.build/bin/doit_ibuild.sh index d7fe7700750..589c831c3f8 100755 --- a/releng/org.eclipse.rse.build/bin/doit_ibuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_ibuild.sh @@ -18,8 +18,8 @@ umask 2 #Use Java5 on build.eclipse.org #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH -export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH +#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH +export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH curdir=`pwd` diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh index b7177793b1e..9b6615c0eaa 100755 --- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh @@ -26,8 +26,8 @@ umask 2 #Use Java5 on build.eclipse.org #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH -export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH +#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH +export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH curdir=`pwd` diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh index d76f5cc8d11..23dfc108028 100755 --- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh +++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh @@ -17,8 +17,8 @@ umask 2 #Use Java5 on build.eclipse.org #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH -export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH +#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH +export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH curdir=`pwd` diff --git a/releng/org.eclipse.rse.build/bin/doit_sbuild.sh b/releng/org.eclipse.rse.build/bin/doit_sbuild.sh index fcd3b522345..29d8fe12ebb 100755 --- a/releng/org.eclipse.rse.build/bin/doit_sbuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_sbuild.sh @@ -18,8 +18,8 @@ umask 2 #Use Java5 on build.eclipse.org #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH -export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH -#export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH +#export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH +export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH curdir=`pwd` diff --git a/releng/org.eclipse.rse.build/bootstrap.sh b/releng/org.eclipse.rse.build/bootstrap.sh index 326923b97fd..12e9c2ce699 100644 --- a/releng/org.eclipse.rse.build/bootstrap.sh +++ b/releng/org.eclipse.rse.build/bootstrap.sh @@ -179,7 +179,8 @@ if [ "$HOSTNAME" == "utils" ] then #Running on build.eclipse.org java15_home=/shared/common/ibm-java2-ppc64-50 - java14_home=/shared/webtools/apps/IBMJava2-ppc64-142 + #java14_home=/shared/webtools/apps/IBMJava2-ppc64-142 + java14_home=/shared/webtools/apps/IBMJava2-ppc-142 javadoc="-Djavadoc15=$java15_home/bin/javadoc" PATH=$java15_home/jre/bin:$PATH;export PATH elif [ "$HOSTNAME" == "parser.takefive.co.at" ]