prep for 3.2.4 patch builds

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

@@ -18,13 +18,31 @@
     <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
 
     <!-- = = = end standard properties pattern = = = -->
-    <echo message="ant.file: ${ant.file}"/>
+    <echo level="debug" 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
+            antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
+            target="getBaseBuilder"/>
+        <condition
+            property="antQuietValue"
+            value="-quiet"
+            else="">
+            <istrue value="${env.USE_QUIET}"/>
+        </condition>
+        <!-- TODO: should set 'failonerror' to false, and follow up with error 
+        check and appropriate cleanup/finishup actions before failing -->
+
         <java
-            jar="${eclipse.launcher}"
             fork="true"
-            failonerror="true">
+            failonerror="true"
+            classname="org.eclipse.equinox.launcher.Main">
+            <classpath>
+                <fileset dir="${pde.builder.path}/plugins">
+                    <include name="org.eclipse.equinox.launcher_*.jar"/>
+                </fileset>
+            </classpath>
             <jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
@@ -46,6 +64,7 @@
             <arg value="${basedir}/workspace"/>
             <arg value="-application"/>
             <arg value="org.eclipse.ant.core.antRunner"/>
+            <arg value="${antQuietValue}"/>
             <arg value="-buildfile"/>
             <arg value="${ant.file}"/>
             <arg value="publish"/>
@@ -64,6 +83,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"/>
@@ -104,11 +127,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"/>
 
@@ -129,7 +154,7 @@
                 dir="${env.ANT_WORKING}/${projectname}"
                 includes="antBuilderOutput.log"/>
         </copy>
-
+               
         <!-- final count files -->
         <countBuildFiles
             sourceDirectory="${buildDirectory}/${buildLabel}"