prep for P2

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" />

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>