From e8c58d8bef957257f078d75b79ee7be02bf6ef3d Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 2 Jan 2008 05:10:09 +0000
Subject: [PATCH] streamline build scripts
---
releng.control/cc_config.xml | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 976d3c842..23bc10280 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -11,11 +11,6 @@
<!-- Note: can not quite use "standard properites" pattern, as in ant files,
since for CC, it is an error if a property file does not exist. -->
-
- <!-- remember, our logDir must be same as logdir specified in CC's web.xml file -->
- <property
- name="logDir"
- value="${env.LOG_DIR}/${project.name}" />
<property
name="time.tenMinutes"
value="600" />
@@ -30,31 +25,31 @@
value="31536000" />
<plugin
name="log"
- dir="${logDir}"
+ dir="${env.LOG_DIR}/${project.name}"
encoding="ISO-8859-1" />
<plugin
name="currentbuildstatuslistener"
- file="${logDir}/status.txt" />
+ file="${env.LOG_DIR}/${project.name}/status.txt" />
+ <!-- remember, our logDir must be same as logdir specified in CC's web.xml file -->
<plugin
name="ant"
antscript="${env.RELENG_CONTROL}/ant.sh"
buildfile="${env.RELENG_CONTROL}/cc_project_build.xml"
target="Build"
- useQuiet="${env.USE_QUIET}"
useLogger="${env.USE_LOGGER}"
- savelogdir="${logDir}"
- usedebug="${env.USE_DEBUG}"
- antworkingdir="${env.RELENG_CONTROL}" />
+ useQuiet="${env.USE_QUIET}"
+ savelogdir="${env.LOG_DIR}/${project.name}"
+ antworkingdir="${env.ANT_WORKING}" />
<plugin
name="project"
buildafterfailed="true">
<dateformat
format="yyyy-MM-dd HH:mm '('z')'" />
<log
- dir="${logDir}"
+ dir="${env.LOG_DIR}/${project.name}"
encoding="ISO-8859-1">
<merge
- dir="${env.BUILD_HOME}/tests/${project.name}/results/xml" />
+ dir="${env.PROJECT_TESTS}/${project.name}/results/xml" />
<delete
every="10"
unit="DAY"
@@ -74,19 +69,18 @@
antscript="${env.RELENG_CONTROL}/ant.sh"
buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml"
target="copyArtifacts"
- useQuiet="${env.USE_QUIET}"
- useLogger="${env.USE_LOGGER}"
- savelogdir="${logDir}"
- usedebug="${env.USE_DEBUG}"
- antworkingdir="${env.RELENG_CONTROL}">
+ useQuiet="false"
+ useLogger="true"
+ savelogdir="${env.LOG_DIR}/${project.name}"
+ antworkingdir="${env.ANT_WORKING}">
<property
name="localArtifactsDirectory"
- value="${env.BUILD_HOME}/artifacts/${project.name}" />
+ value="${env.PROJECT_ARTIFACTS}/${project.name}" />
</antpublisher>
<email
mailhost="localhost"
returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
- returnname="${env.BUILD_RETURN_NAME}"
+ returnname="${env.BUILD_BUILDMASTER_RETURN_NAME}"
skipusers="${env.SKIPUSERS}"
subjectprefix="[${project.name}]"
spamwhilebroken="false"
--
GitLab