test fast fail

releng.wtpbuilder/distribution/wtp.build/build.xml

diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 9eae977..e8903ff 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -53,7 +53,11 @@
                 value="false"/>
         </ant>
 
-        <antcall target="checkForFastFail"/>
+        <!-- TODO: unclear if "eclipseBuildFailOnError" does anything one way or other? -->
+
+
+        <!-- fast fail, if serious problem -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
 
         <ant antfile="${buildTargets}">
             <property
@@ -63,7 +67,10 @@
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
-        <antcall target="checkForFastFail"/>
+        
+        <!-- fast fail, if serious problem -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
+
         <ant antfile="${buildTargets}">
             <property
                 name="component"
@@ -72,7 +79,10 @@
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
-        <antcall target="checkForFastFail"/>
+
+            <!-- fast fail, if serious problem -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
+
         <ant antfile="${buildTargets}">
             <property
                 name="component"
@@ -81,7 +91,11 @@
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
-        <antcall target="checkForFastFail"/>
+
+                    <!-- fast fail, if serious problem -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
+
+
         <ant antfile="${buildTargets}">
             <property
                 name="component"
@@ -90,7 +104,10 @@
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
-        <antcall target="checkForFastFail"/>
+
+            <!-- fast fail, if serious problem -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
+
         <ant antfile="${buildTargets}">
             <property
                 name="component"
@@ -99,58 +116,17 @@
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
-        <antcall target="checkForFastFail"/>
-    	<!-- copy early, if we can ... else site won't be created, if we fail -->
-        <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
 
-        <antcall target="handleCompilationProblems"/>
+        <!-- fast fail, if serious problem -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
 
-
+        <!-- we fail for compilation problems only at end, so everything gets a chance to try 
+             and compile -->
+        <ant antfile="${wtp.builder.home}/scripts/build/checkForCompilationProblems.xml"/>
 
     </target>
 
-    <target
-        name="handleCompilationProblems"
-        depends="checkIfCompileProblems"
-        if="compilation.problem.found">
 
-    	<!-- if there is a problem, leave a marker file in download directory, so the webpage can 
-    	describe what happened -->
-
-        <echo
-            message="Compilation problems were found"
-            file="${buildDirectory}/${buildLabel}/compilationProblems.txt"/>
-
-       <!-- always force an early copy, before fail, so all results and files get to "downloads" area -->
-        <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
-        <fail
-            if="compilation.problem.found"
-            message="The remaining build and tests were canceled since compilation problems were found."/>
-    </target>
-
-
-    <target name="checkIfCompileProblems">
-       <!-- 
-       Not sure how reliable the presence of this 'compilation.problem' file is ... 
-                I just noticed it in recent PDE builds with compile problems. 
-                May have to make this "fancier" in future. 
-                For now, looks only one level down in plugins directory (in build's workdir) for a file with 
-                the name 'complilation.problem'. We may have a "summary" in xml file format, summarizing logs, 
-                 ... but not sure then created (during site? We'd have to call site first. This way, we'll see if the match :) . 
-           -->
-        <available
-            file="compilation.problem"
-            type="file"
-            property="compilation.problem.found">
-            <filepath>
-                <dirset dir="${buildDirectory}">
-                    <include name="plugins/*"/>
-                </dirset>
-
-            </filepath>
-        </available>
-        <echo message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
-    </target>
 	
 <!-- invoking runbuild.xml targetting getBaseBuilder -->
     <target
@@ -170,18 +146,6 @@
             target="getBaseBuilder"/>
     </target>
 
-    <target name="checkForFastFail">
-    	
-    	<!-- copy early, if we can ... else site won't be created, if we fail -->
-        <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
 
-        <fail message="BUILD FAILED found in log. Failing fast.">
-            <condition>
-                <resourcecontains
-                    resource="${env.PROJECT_LOGS}/${projectname}/antBuilderOutput.txt"
-                    substring="BUILD FAILED"/>
-            </condition>
-        </fail>
-    </target>
 
 </project>
\ No newline at end of file