mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-19 14:15:50 +02:00
Bug 344518 - Regression: ant EmailTask fails with JRE-1.5
Use 1.6 for basebuilder
This commit is contained in:
parent
b66c8c2cc8
commit
8de21ee230
4 changed files with 8 additions and 7 deletions
|
@ -30,8 +30,8 @@ echo ${mydir}
|
|||
|
||||
#Use Java5 on build.eclipse.org
|
||||
#export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
|
||||
#export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
|
||||
export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
|
||||
export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
|
||||
#export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
|
||||
#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
|
||||
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@ umask 22
|
|||
|
||||
#Use Java5 on build.eclipse.org
|
||||
#export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
|
||||
#export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
|
||||
export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
|
||||
export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
|
||||
#export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
|
||||
#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
|
||||
|
||||
curdir=`pwd`
|
||||
|
|
|
@ -51,6 +51,7 @@ bootclasspath_15="/shared/common/jdk-1.5.0-22.x86_64/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"
|
||||
bootclasspath=${bootclasspath_14}
|
||||
|
||||
command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
|
||||
command="$command -application org.eclipse.ant.core.antRunner "
|
||||
|
@ -70,7 +71,7 @@ command="$command -DfetchTag=HEAD "
|
|||
command="$command -DskipFetch "
|
||||
command="$command -Dmydstamp=${mydstamp} "
|
||||
command="$command -Dmytstamp=${mytstamp} "
|
||||
#command="$command -Dbootclasspath=${bootclasspath_16} "
|
||||
#command="$command -Dbootclasspath=${bootclasspath} "
|
||||
#command="$command -DJ2SE-1.4=${bootclasspath_14} "
|
||||
#command="$command -DJ2SE-1.5=${bootclasspath_15} "
|
||||
#command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
|
||||
|
|
|
@ -76,7 +76,7 @@ bootclasspath_15="/shared/common/jdk-1.5.0-22.x86_64/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"
|
||||
|
||||
bootclasspath=${bootclasspath_14}
|
||||
|
||||
command="java -cp ${basebuilder}/plugins/${launcher} org.eclipse.core.launcher.Main "
|
||||
command="$command -application org.eclipse.ant.core.antRunner "
|
||||
|
@ -97,7 +97,7 @@ if [ "$buildType" = "N" ]; then
|
|||
command="$command -DfetchTag=HEAD "
|
||||
fi
|
||||
command="$command -DdoPublish=true "
|
||||
command="$command -Dbootclasspath=${bootclasspath_16} "
|
||||
command="$command -Dbootclasspath=${bootclasspath} "
|
||||
command="$command -DJ2SE-1.4=${bootclasspath_14} "
|
||||
command="$command -DJ2SE-1.5=${bootclasspath_15} "
|
||||
command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
|
||||
|
|
Loading…
Add table
Reference in a new issue