streamline build scripts
diff --git a/releng.control/cc_copyArtifacts.xml b/releng.control/cc_copyArtifacts.xml
index c27842f..e380e32 100644
--- a/releng.control/cc_copyArtifacts.xml
+++ b/releng.control/cc_copyArtifacts.xml
@@ -1,6 +1,7 @@
-<project name="cc_copyArtifacts"
- default="copyArtifacts"
- basedir=".">
+<project
+ name="cc_copyArtifacts"
+ default="copyArtifacts"
+ basedir=".">
<!-- = = = standard properties pattern = = = -->
@@ -9,44 +10,54 @@
some variables, e.g. ones we set, since properties are case sensitive, even if
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
+ <property
+ environment="env" />
<!--
Let users override standard properties, if desired.
If directory, file, or some properties do not exist,
then standard properties will be used.
-->
- <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <property
+ file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- = = = end standard properties pattern = = = -->
-
-
-
- <property name="checkoutprojectname"
- value="${projectname}" />
-
-
- <target name="copyArtifacts" depends="init">
- <mkdir dir="${localStampedArtifactsDirectory}" />
- <mkdir dir="${localStampedArtifactsDirectory}/${buildLabel}" />
- <copy todir="${localStampedArtifactsDirectory}/${buildLabel}"
- overwrite="true">
- <fileset dir="${env.BUILD_HOME}/projects/${projectname}/workdir/${buildLabel}" />
+ <property
+ name="checkoutprojectname"
+ value="${projectname}" />
+ <target
+ name="copyArtifacts"
+ depends="init"
+ if="buildLabel">
+ <mkdir
+ dir="${localStampedArtifactsDirectory}" />
+ <mkdir
+ dir="${localStampedArtifactsDirectory}/${buildLabel}" />
+ <copy
+ todir="${localStampedArtifactsDirectory}/${buildLabel}"
+ overwrite="true">
+ <fileset
+ dir="${env.PROJECT_PROJECTS}/${projectname}/workdir/${buildLabel}" />
+ <fileset
+ dir="${env.ANT_WORKING}" />
</copy>
</target>
-
- <target name="init">
-
- <property name="labelfile"
- value="${env.BUILD_HOME}/projects/${projectname}/workdir/label.properties" />
-
- <available file="${labelfile}"
- property="labelfileavailable" />
- <fail unless="labelfileavailable" />
- <property file="${labelfile}" />
- <property name="localStampedArtifactsDirectory"
- value="${localArtifactsDirectory}/${cctimestamp}" />
-
+ <target
+ name="init">
+ <fail unless="env.PROJECT_PROJECTS" />
+ <fail unless="projectname" />
+ <property
+ name="labelfile"
+ value="${env.PROJECT_PROJECTS}/${projectname}/workdir/label.properties" />
+ <available
+ file="${labelfile}"
+ property="labelfileavailable" />
+ <fail
+ unless="labelfileavailable" />
+ <property
+ file="${labelfile}" />
+ <property
+ name="localStampedArtifactsDirectory"
+ value="${localArtifactsDirectory}/${cctimestamp}" />
</target>
-
-</project>
+</project>
\ No newline at end of file