From d766e29a11602e044a58f77e24725fcdd2b34f0a Mon Sep 17 00:00:00 2001
From: wisberg <wisberg>
Date: Fri, 17 Jun 2005 06:29:51 +0000
Subject: [PATCH] consolidated build script failure reports in one target

---
 build/release/build.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/build/release/build.xml b/build/release/build.xml
index 698ea0b81..b0f403f36 100644
--- a/build/release/build.xml
+++ b/build/release/build.xml
@@ -77,7 +77,7 @@
 	    <build-aspectj vm="${max.vm}" target="all"/>
 	    <build-aspectj vm="${max.vm}" target="test-each-module"/>
 		<build-aspectj vm="${max.vm}" target="junitreport"/>
-	    <antcall target="product-tests"/>
+		<antcall target="product-tests"/>
 		<!-- TODO re-enable antcall target="harness-tests"/ --> 
 		<build-aspectj vm="13" target="compile-runtime-11"/>
 			
@@ -122,13 +122,7 @@
 					location="${aj.logs.dir}/build-@{target}"/>
 				<param name="ant.properties" 
 				    value="${do.ant.props} ${aspectj.build.props}"/>
-				<param name="resultproperty"
-					value="@{target}.@{vm}.result"/>
 			</antcall>
-			<echo message="1 compile-runtime-11.13.result: ${compile-runtime-11.13.result}"/>
-			<report-if-failed property="@{target}.@{vm}.result"
-				text="Build failed: build-@{target} (@{vm})"/>
-			<echo message="2 compile-runtime-11.13.result: ${compile-runtime-11.13.result}"/>
 		</sequential>
     </macrodef>
     
@@ -160,14 +154,13 @@
      file/target -f ${run.ant.file} ${ant.target}
          options ${ant.verbose} ${ant.properties}
           output ${ant.output.file}
-  resultproperty ${resultproperty}
      failonerror ${failonerror}
   aspectjrt.path ${aspectjrt.path}
 </echo>
 
 		<java 
 			fork="true"
-			resultproperty="${resultproperty}"
+			resultproperty="do-run-ant.result"
 			failonerror="${failonerror}"
 			dir="${ant.dir}"
 			jvm="${build.java.command}"
@@ -200,7 +193,11 @@
 				file="${aj.install.dir}"/>
 			<arg line="-f ${run.ant.file} ${ant.target} ${ant.verbose} ${ant.properties}"/>
 		</java>
-		<report-if-failed property="${resultproperty}"
+		<condition property="do-run-ant.failed" value="true">
+			<not><equals arg1="0" arg2="${do-run-ant.result}"/></not>			
+		</condition>
+		<echo message="dra: do-run-ant.failed=${do-run-ant.failed} do-run-ant.result=${do-run-ant.result}"/>
+		<report-if-failed property="do-run-ant.failed"
 			text="Build failed: ${ant.output.file}"/>
 	</target>
     
-- 
2.39.5