cleanup and format

releng.wtpbuilder/distribution/jsdt.site/build.xml

@@ -20,7 +20,6 @@
     <!-- = = = end standard properties pattern = = = -->
     <echo message="ant.file: ${ant.file}"/>
     <target name="build">
-        <mkdir dir="${buildDirectory}/${buildLabel}"/>
 
           <!-- make sure there is a base builder, since we need the launcher -->
         <ant
@@ -31,7 +30,7 @@
         <java
             jar="${eclipse.launcher}"
             fork="true"
-            failonerror="true">
+            failonerror="false">
             <jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
@@ -71,6 +70,10 @@
             property="component.dir"/>
         <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
         <property file="${buildDirectory}/label.properties"/>
+
+         <!-- buildLabel is defined in label.properties -->
+        <mkdir dir="${buildDirectory}/${buildLabel}"/>
+
         <property
             name="publish.xml"
             value="${component.dir}/publish.xml"/>
@@ -111,11 +114,13 @@
 
         <!--  Get the build map over for the results to point to. -->
         <copy
+            failonerror="false"
             file="${buildDirectory}/directory.txt"
             tofile="${result}/directory.txt"/>
 
         <!-- Copy info for build identification -->
         <copy
+            failonerror="false"
             file="${buildDirectory}/label.properties"
             tofile="${result}/label.properties"/>
 

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

@@ -30,7 +30,7 @@
         <java
             jar="${eclipse.launcher}"
             fork="true"
-            failonerror="true">
+            failonerror="false">
             <jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>

releng.wtpbuilder/distribution/wtp4x.site/build.xml

@@ -20,9 +20,8 @@
     <!-- = = = end standard properties pattern = = = -->
     <echo message="ant.file: ${ant.file}"/>
     <target name="build">
-        <mkdir dir="${buildDirectory}/${buildLabel}"/>
 
-          <!-- make sure there is a base builder, since we need the launcher -->
+        <!-- make sure there is a base builder, since we need the launcher -->
         <ant
             antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
             target="getBaseBuilder"/>
@@ -31,7 +30,7 @@
         <java
             jar="${eclipse.launcher}"
             fork="true"
-            failonerror="true">
+            failonerror="false">
             <jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
@@ -71,6 +70,10 @@
             property="component.dir"/>
         <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
         <property file="${buildDirectory}/label.properties"/>
+
+         <!-- buildLabel is defined in label.properties -->
+        <mkdir dir="${buildDirectory}/${buildLabel}"/>
+
         <property
             name="publish.xml"
             value="${component.dir}/publish.xml"/>
@@ -111,11 +114,13 @@
 
         <!--  Get the build map over for the results to point to. -->
         <copy
+            failonerror="false"
             file="${buildDirectory}/directory.txt"
             tofile="${result}/directory.txt"/>
 
         <!-- Copy info for build identification -->
         <copy
+            failonerror="false"
             file="${buildDirectory}/label.properties"
             tofile="${result}/label.properties"/>