From f88f05c0b3e8becba425218525196a5c46c6607b Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 2 Jan 2008 21:24:46 +0000
Subject: [PATCH] streamline build scripts
---
releng.control/ant.sh | 12 ++++++++++++
releng.control/cc_config.xml | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index 859cea299..fa1605fcb 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -7,10 +7,22 @@
if [ -n $BUILD_INITIALIZED ]
then
+ pushd .
+ cd ${RELENG_CONTROL}
source commonVariations.shsource
source ${RELENG_CONTROL}/commonComputedVariables.shsource
+ popd
fi
+a# For most ant tasks, we want Java 4 to be default,
+# so if not desired (such as for WTP 2.0 unit tests),
+# then we have to spec Java 5 right there where we run
+# the tests.
+# Note: this must be Java 4, for now, for "customizeAccessRules"
+# to work. I'll recompile it for Java 5 eventually, but it causes
+# a problem, and a problem only on PPC machine/VM.
+export JAVA_HOME=${JAVA_4_HOME}
+
ANT_CMD=${ANT_HOME}/bin/ant
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 8448c6b64..d4694145d 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -38,7 +38,8 @@
target="Build"
useLogger="${env.USE_LOGGER}"
useQuiet="${env.USE_QUIET}"
- savelogdir="${env.LOG_DIR}/${project.name}" />
+ savelogdir="${env.LOG_DIR}/${project.name}"
+ antworkingdir="${env.ANT_WORKING}" />
<plugin
name="project"
buildafterfailed="true">
--
GitLab