[jbosstools-commits] JBoss Tools SVN: r41899 - trunk/build/results.

[jbosstools-commits at lists.jboss.org]

Author: nickboldt
Date: 2012-06-12 17:51:32 -0400 (Tue, 12 Jun 2012)
New Revision: 41899

Modified:
   trunk/build/results/build.xml
Log:
don't need tmpdir and cleanup steps, so remove; parameterize target folder; use BUILD_ID if maven.build.timestamp not set

Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml	2012-06-12 18:56:39 UTC (rev 41898)
+++ trunk/build/results/build.xml	2012-06-12 21:51:32 UTC (rev 41899)
@@ -9,8 +9,6 @@
 	</condition>
 	<mkdir dir="${COMMON_TOOLS}" />
 
-	<property name="tmpdir" value="${java.io.tmpdir}/jbosstools-results-build" />
-
 	<target name="get.ant-contrib" unless="ant-contrib.jar.exists">
 		<property name="ANTCONTRIB_MIRROR" value="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2" />
 		<get usetimestamp="true" dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" />
@@ -37,9 +35,10 @@
 			</classpath>
 		</taskdef>
 
-		<mkdir dir="${tmpdir}" />
-		<delete dir="target/" quiet="true" />
-		<mkdir dir="target/" />
+		<!-- run locally, or else target ${STAGINGDIR} folder if called from publish.sh -->
+		<property name="target.dir" value="./target/"/>
+		<delete dir="${target.dir}" quiet="true" />
+		<mkdir dir="${target.dir}" />
 	</target>
 
 	<target name="build" depends="init">
@@ -58,9 +57,15 @@
 				<if>
 					<contains string="${TIMESTAMP}" substring="maven.build.timestamp"/>
 					<then>
-						<tstamp>
-							<format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
-						</tstamp>
+						<propertyregex property="TIMESTAMP" input="${BUILD_ID}" defaultvalue="${BUILD_ID}" regexp="(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2}).+" replace="\1\2\3-\4\5"/>
+						<if>
+							<contains string="${TIMESTAMP}" substring="BUILD_ID"/>
+							<then>
+								<tstamp>
+									<format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
+								</tstamp>
+							</then>
+						</if>
 					</then>
 				</if>
 			</then>
@@ -90,8 +95,6 @@
 		<echo level="verbose">TIMESTAMP = ${TIMESTAMP}</echo>
 
 		<antcall target="generate.html" />
-
-		<antcall target="cleanup" />
 	</target>
 
 	<target name="generate.html">
@@ -119,7 +122,7 @@
 		</condition>
 
 		<!-- use locally built files with relative paths -->
-		<copy todir="target/" overwrite="true">
+		<copy todir="${target.dir}" overwrite="true">
 			<fileset file="index-template.html" />
 			<mapper type="merge" to="index.html" />
 			<filterchain>
@@ -128,12 +131,6 @@
 		</copy>
 	</target>
 
-	<target name="cleanup">
-		<delete includeemptydirs="true" quiet="true">
-			<fileset dir="${tmpdir}" />
-		</delete>
-	</target>
-
 <!-- macros -->
 
 	<macrodef name="get.size">