From 6afd26643eb3c3aad9144fe219efbcc4b72b1a5d Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 20 Aug 2007 06:43:52 +0000
Subject: [PATCH] minor fixes/improvements
---
releng.control/cc_config.xml | 3 ++-
releng.control/commonVariations.shsource | 8 +++++---
.../somePathDirectory/commonVariations.shsource | 11 ++++++-----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 288dfaaf5..d63acb3f6 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -59,11 +59,12 @@
<email
mailhost="localhost"
returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
+ returnname="${env.BUILD_RETURN_NAME}"
skipusers="${env.SKIPUSERS}"
subjectprefix="[${project.name}]"
spamwhilebroken="false"
buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
- <always address="${env.BUILD_TOADDRESS}" />
+ <always address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
</email>
</publishers>
</plugin>
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index 73beb898c..3825fa54c 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -2,7 +2,8 @@
# Note: if "local" users have this file first in their path, then
# the bash shell's "include source" function will find that paths version
-# first, instead of this "standard" eclipse ppc one.
+# first, instead of this "standard" one which is for the
+# production Eclipse builds.
# this file is intentionally named "shsource" to denote this is intended to
# be included in other sh files, with "source" command, not
@@ -16,7 +17,7 @@ export DISPLAY=127.0.0.1:1.0
export JAVA_4_DIR="IBMJava2-ppc-142"
export JAVA_5_DIR="ibm-java2-ppc-50"
export ANT_DIR="apache-ant-1.7.0"
-export CC_DIR_NAME="cruisecontrol-bin-2.7"
+export CC_DIR_NAME="cruisecontrol-bin-2.7.1-RC3"
export BASEOS=linux
export BASEWS=gtk
@@ -28,8 +29,9 @@ export LOCAL_BUILD_PROPERTIES_DIR=
export STANDARD_PROPERTIES_DIR=${BUILD_HOME}/releng.control/standardMachineProperties
export BUILD_BUILDMASTER_EMAIL=wtpBuild@eclipse.org
+export BUILD_RETURN_NAME=wtpBuild
export BUILD_RESULT_URL=http://build.eclipse.org:7777/cruisecontrol/buildresults
-export BUILD_TOADDRESS=david_williams@us.ibm.com
+export BUILD_ALWAYS_TO_ADDRESS=david_williams@us.ibm.com
# for builds on local machines, SKIPUSERS should be 'true' to avoid
# notifying users about those builds on your local machine
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
index 647c1b36f..4974286c9 100644
--- a/releng.control/somePathDirectory/commonVariations.shsource
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -16,10 +16,10 @@ export DISPLAY=127.0.0.1:0
# remember to check virtual display with
# ps -ef | grep Xvfb
-JAVA_4_DIR="j2sdk1.4.2_11"
+JAVA_4_DIR="j2sdk1.4.2_15"
JAVA_5_DIR="jdk1.5.0_09"
ANT_DIR="apache-ant-1.7.0"
-export CC_DIR_NAME="cruisecontrol-bin-2.7"
+export CC_DIR_NAME="cruisecontrol-bin-2.7.1-RC3"
export BASEOS=linux
export BASEWS=gtk
@@ -31,9 +31,10 @@ export LOCAL_BUILD_PROPERTIES_DIR=${BUILD_HOME}/localBuildProperties
# technically should not be needed for "local builds" ... but ... just in case.
export STANDARD_PROPERTIES_DIR=${BUILD_HOME}/releng.control/standardMachineProperties
-export BUILD_BUILDMASTER_EMAIL=davidw@davidw.com
-export BUILD_RESULT_URL=http://davidw.com:7777/cruisecontrol/buildresults
-export BUILD_TOADDRESS=david_williams@us.ibm.com
+export BUILD_BUILDMASTER_EMAIL=davidw@davidw.raleigh.ibm.com
+export BUILE_RETURN_NAME=davidwAtWork
+export BUILD_RESULT_URL=http://davidw.raleigh.ibm.com:7777/cruisecontrol/buildresults
+export BUILD_ALWAYS_TO_ADDRESS=david_williams@us.ibm.com
# for builds on local machines, SKIPUSERS should be 'true' to avoid
# notifying users about those builds on your local machine
--
GitLab