From 24fdbacdfe6c0e999b4dc4a18f9b73a8efa121f6 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 3 May 2011 11:15:27 +0000 Subject: [PATCH] Bug 344518 - Regression: ant EmailTask fails with JRE-1.5 Use 1.6 for basebuilder --- releng/org.eclipse.rse.build/go.sh | 7 ++++--- releng/org.eclipse.rse.build/nightly.sh | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh index 3fb8f70efc0..dad86e8f22b 100755 --- a/releng/org.eclipse.rse.build/go.sh +++ b/releng/org.eclipse.rse.build/go.sh @@ -45,9 +45,10 @@ rm -rf "${buildDirectory}" # default value of the bootclasspath attribute used in ant javac calls. # these pathes are valid on build.eclipse.org -bootclasspath="/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar" +bootclasspath_14="/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar" bootclasspath_15="/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar" #bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar" +bootclasspath_16="/shared/tools/tm/jdk-1.6/jre/lib/rt.jar" #bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar" bootclasspath_foundation11="/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip" @@ -69,8 +70,8 @@ command="$command -DfetchTag=HEAD " command="$command -DskipFetch " command="$command -Dmydstamp=${mydstamp} " command="$command -Dmytstamp=${mytstamp} " -#command="$command -Dbootclasspath=${bootclasspath} " -#command="$command -DJ2SE-1.4=${bootclasspath} " +#command="$command -Dbootclasspath=${bootclasspath_16} " +#command="$command -DJ2SE-1.4=${bootclasspath_14} " #command="$command -DJ2SE-1.5=${bootclasspath_15} " #command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} " #command="$command -DJ2SE-1.2=../jres/1.2.2/lib/rt.jar " diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh index 1bf71dc0914..902d57d0d14 100755 --- a/releng/org.eclipse.rse.build/nightly.sh +++ b/releng/org.eclipse.rse.build/nightly.sh @@ -70,9 +70,10 @@ rm -rf "${buildDirectory}" # default value of the bootclasspath attribute used in ant javac calls. # these pathes are valid on build.eclipse.org -bootclasspath="/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar" +bootclasspath_14="/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar" bootclasspath_15="/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar" #bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar" +bootclasspath_16="/shared/tools/tm/jdk-1.6/jre/lib/rt.jar" #bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar" bootclasspath_foundation11="/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip" @@ -96,8 +97,8 @@ if [ "$buildType" = "N" ]; then command="$command -DfetchTag=HEAD " fi command="$command -DdoPublish=true " -command="$command -Dbootclasspath=${bootclasspath} " -command="$command -DJ2SE-1.4=${bootclasspath} " +command="$command -Dbootclasspath=${bootclasspath_16} " +command="$command -DJ2SE-1.4=${bootclasspath_14} " command="$command -DJ2SE-1.5=${bootclasspath_15} " command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} " #command="$command postBuild "