From f2cf08b21231259bf69f14cf5a243a429ca2739c Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Thu, 20 Mar 2008 06:58:42 +0000
Subject: [PATCH] prep for P2
---
releng.control/cc_config.xml | 12 +++++++++---
releng.control/cc_copyArtifacts.xml | 4 ++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 5c5d34552..a07416e71 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -88,7 +88,9 @@
name="localArtifactsDirectory"
value="${env.PROJECT_ARTIFACTS}/${project.name}" />
</antpublisher>
- <htmlemail>
+ <htmlemail
+ antWorkingDir="${env.BUILD_HOME}/tmp"
+ saveLogDir="${env.BUILD_HOME}/tmp">
<failure
address="${env.FAILED_ADDRESS}"
reportWhenFixed="true" />
@@ -254,7 +256,9 @@
value="${env.PROJECT_ARTIFACTS}/${project.name}" />
</antpublisher>
<htmlemail
- skipusers="true">
+ skipusers="true"
+ antWorkingDir="${env.BUILD_HOME}/tmp"
+ saveLogDir="${env.BUILD_HOME}/tmp">
<failure
address="${env.FAILED_ADDRESS}"
reportWhenFixed="true" />
@@ -418,7 +422,9 @@
value="${env.PROJECT_ARTIFACTS}/${project.name}" />
</antpublisher>
<htmlemail
- skipusers="true">
+ skipusers="true"
+ antWorkingDir="${env.BUILD_HOME}/tmp"
+ saveLogDir="${env.BUILD_HOME}/tmp">
<failure
address="${env.FAILED_ADDRESS}"
reportWhenFixed="true" />
diff --git a/releng.control/cc_copyArtifacts.xml b/releng.control/cc_copyArtifacts.xml
index c5ef43e49..d4e501d54 100644
--- a/releng.control/cc_copyArtifacts.xml
+++ b/releng.control/cc_copyArtifacts.xml
@@ -50,8 +50,8 @@
message="Nothing to copy. Build failed earlier.">
<condition>
<not>
- <exists
- dir="${env.PROJECT_PROJECTS}/${projectname}/workdir/${buildLabel}" />
+ <available
+ file="${env.PROJECT_PROJECTS}/${projectname}/workdir/${buildLabel}" />
</not>
</condition>
</fail>
--
GitLab