diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh index 854953cff2cbb988d77d665cb4eeaedb1dfba6ca..bf1d4e07939bbb0a889510684aab5875d92b24db 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh @@ -5,10 +5,12 @@ APP_NAME=org.eclipse.equinox.p2.publisher.CategoryPublisher devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" DROPDIR="/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.2.0/R-3.2.0-20100615235519" diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-321.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-321.sh index 4774eede04ee61541f99ef2d4c20a7215a2025ce..cc34eef3853ae1ebf3b97cd2d569f6ef29eea7ab 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-321.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-321.sh @@ -5,10 +5,12 @@ APP_NAME=org.eclipse.equinox.p2.publisher.CategoryPublisher devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" DROPDIR="/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.2.1/R-3.2.1-20100730021206" diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-322.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-322.sh index ca0832888c7c449f90e73a858d7330146f77fa1b..3e9c4d33d2eeb11aa3653f269d2ad3d65eeffaef 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-322.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-322.sh @@ -6,10 +6,12 @@ APP_NAME=org.eclipse.equinox.p2.publisher.CategoryPublisher devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" DROPDIR="/opt/public/webtools/committers/wtp-R3.2.2-M/20100910064233/M-3.2.2-20100910064233" diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-320.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-320.sh index 2eb163880b94c1b199efab253054882deab84cab..72db92202f8c0cd6db6d1dc7d7cdc9caa00f8998 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-320.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-320.sh @@ -5,10 +5,12 @@ APP_NAME=org.eclipse.wtp.releng.tools.addRepoProperties devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc -Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc " +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" # remember, the '&' should NOT be unescaped here ... the p2 api (or underlying xml) will escape it. diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-321.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-321.sh index 6baefed4bb4125ba362a37fae48fc36a84539288..6b425bcfc039d255c9d782a3da1a1f965e20d3bd 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-321.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-321.sh @@ -5,10 +5,12 @@ APP_NAME=org.eclipse.wtp.releng.tools.addRepoProperties devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc -Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc " +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" # remember, the '&' should NOT be unescaped here ... the p2 api (or underlying xml) will escape it. diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-322.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-322.sh index 7ac6d2166a4e02cdb22340d1f787fb4079cefca8..204e69c9adc29565f9148c67618cdb1ca9444d53 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-322.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-322.sh @@ -4,18 +4,20 @@ APP_NAME=org.eclipse.wtp.releng.tools.addRepoProperties devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" -DROPDIR="/opt/public/webtools/committers/wtp-R3.2.2-M/20100910064233/M-3.2.2-20100910064233" +DROPDIR="/opt/public/webtools/committers/wtp-R3.2.2-M/20100915173744/M-3.2.2-20100915173744" REPO="${DROPDIR}/repository/" # remember, MIRRORURL should point to where download artifacts will be ... we don't mirror from # commmitters area, and don't want to have to change it just for a promote from committers to downloads -MIRRORURL="/webtools/downloads/drops/R3.2.2/M-3.2.2-20100910064233/repository/" +MIRRORURL="/webtools/downloads/drops/R3.2.2/M-3.2.2-20100915173744/repository/" if [ ! -z $MIRRORURL ] then diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-330.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-330.sh index efb8599a37c340746fa74b2425631fd553031e9a..2a3a3e844ab27afd4e2080b501b4d59ef4218084 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-330.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/addRepoProperties-330.sh @@ -5,10 +5,12 @@ APP_NAME=org.eclipse.wtp.releng.tools.addRepoProperties devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" REPO="/shared/webtools/committers/wtp-R3.3.0-S/20100813105432/S-3.3.0M1-20100813105432/repository/" MIRRORURL="/webtools/downloads/drops/R3.3.0/S-3.3.0M1-20100813105432/repository/" diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh b/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh index 461967a1f5078bfd391e4ffe6b04dcbbef18f473..137fa91c1519ea77d5c51a8c72bd8910d22fdaa3 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/install-relengTools.sh @@ -6,10 +6,12 @@ OTHER_ARGS="-metadataRepository http://download.eclipse.org/webtools/releng/repo devworkspace=./workspace -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_6_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" devArgs=$ibmDevArgs diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml index 8d248a5baa0cd7ced31a2fe16f562edb4b569d74..636537736c92702b2aa9ee07db409c38cf7bd069 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml +++ b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml @@ -6,7 +6,7 @@ <property name="repoDirLocation" - value="/opt/public/webtools/committers/wtp-R3.2.2-M/20100910064233/M-3.2.2-20100910064233/repository/"/> + value="/opt/public/webtools/committers/wtp-R3.2.2-M/20100915173744/M-3.2.2-20100915173744/repository/"/> <p2.process.artifacts pack="true" repositoryPath="file:/${repoDirLocation}"/> diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh b/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh index 52bbfd88710700fd7017b3488d243d11c758f8df..16d00a0afc61489b73e6ba9447575cc93a0d1d87 100644 --- a/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh +++ b/releng.wtpbuilder/manualStepScripts/antrunner/runAntRunner.sh @@ -12,10 +12,12 @@ then fi # we MUST use java 5, when using process/pack artifacts! -JAVA_HOME=/shared/webtools/apps/ibm-java-ppc64-608 +JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386 +JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386 +export JAVA_HOME=${JAVA_5_HOME} devJRE=$JAVA_HOME/jre/bin/java -ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=ppc" +ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86" devArgs=$ibmDevArgs @@ -27,7 +29,7 @@ echo devJRE: $devJRE $devJRE -version echo -ECLIPSE_INSTALL=/shared/webtools/apps/eclipse361/eclipse +ECLIPSE_INSTALL=/shared/webtools/apps/eclipseM20100909/eclipse $ECLIPSE_INSTALL/eclipse -nosplash -debug -consolelog -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR -vm $devJRE -vmargs $devArgs