From 6efe310d5cb7b10d3de14c8f16537cf45bb6f651 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 22 Sep 2010 20:12:17 +0000
Subject: [PATCH] move to new build machine
---
.../manualStepScripts/antrunner/addCategories-320.sh | 6 ++++--
.../manualStepScripts/antrunner/addCategories-321.sh | 6 ++++--
.../manualStepScripts/antrunner/addCategories-322.sh | 6 ++++--
.../antrunner/addRepoProperties-320.sh | 6 ++++--
.../antrunner/addRepoProperties-321.sh | 6 ++++--
.../antrunner/addRepoProperties-322.sh | 10 ++++++----
.../antrunner/addRepoProperties-330.sh | 6 ++++--
.../manualStepScripts/antrunner/install-relengTools.sh | 6 ++++--
.../antrunner/process-artifacts-322.xml | 2 +-
.../manualStepScripts/antrunner/runAntRunner.sh | 8 +++++---
10 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh b/releng.wtpbuilder/manualStepScripts/antrunner/addCategories-320.sh
index 854953cff..bf1d4e079 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 4774eede0..cc34eef38 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 ca0832888..3e9c4d33d 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 2eb163880..72db92202 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 6baefed4b..6b425bcfc 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 7ac6d2166..204e69c9a 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 efb8599a3..2a3a3e844 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 461967a1f..137fa91c1 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 8d248a5ba..636537736 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 52bbfd887..16d00a0af 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
--
GitLab