312patches build
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 3073e1a..1fdc390 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -2,142 +2,170 @@
name="Build specific targets and properties"
default="build"
basedir=".">
-
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
- <!--
- Let users override standard properties, if desired.
- If directory, file, or some properties do not exist,
- then standard properties will be used.
+ <!--
+ Note to be cross-platform, "environment variables" are only
+ appropriate for some variables, e.g. ones we set, since
+ properties are case sensitive, even if the environment variables
+ on your operating system are not, e.g. it will be ${env.Path}
+ not ${env.PATH} on Windows
-->
<property
- file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ environment="env"/>
+ <!--
+ Let users override standard properties, if desired. If
+ directory, file, or some properties do not exist, then standard
+ properties will be used.
+ -->
+ <property
+ file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
<!-- = = = end standard properties pattern = = = -->
-
- <echo message="ant.file: ${ant.file}" />
- <target name="build">
+ <echo
+ message="ant.file: ${ant.file}"/>
+ <target
+ name="build">
<java
jar="${eclipse.launcher}"
fork="true"
failonerror="true">
- <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
- <jvmarg value="-Dosgi.os=${env.BASEOS}" />
- <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
- <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}" />
- <jvmarg value="-DbuildBranch=${buildBranch}" />
- <jvmarg value="-DbuildType=${buildType}" />
- <jvmarg value="-DbuildId=${buildId}" />
- <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
- <jvmarg value="-Dbuild.distribution=${build.distribution}" />
- <jvmarg value="-DbuildDirectory=${buildDirectory}" />
- <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
- <jvmarg
- value="-Dprojectname=${projectname}" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
- <jvmarg
- value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
- <jvmarg
- value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log" />
-
- <arg value="-data" />
- <arg value="${basedir}/workspace" />
- <arg value="-application" />
- <arg value="org.eclipse.ant.core.antRunner" />
- <arg value="-buildfile" />
- <arg value="${ant.file}" />
- <arg value="publish" />
+ <jvmarg
+ value="-Dosgi.ws=${env.BASEWS}"/>
+ <jvmarg
+ value="-Dosgi.os=${env.BASEOS}"/>
+ <jvmarg
+ value="-Dosgi.arch=${env.BASEARCH}"/>
+ <jvmarg
+ value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
+ <jvmarg
+ value="-DbuildBranch=${buildBranch}"/>
+ <jvmarg
+ value="-DbuildType=${buildType}"/>
+ <jvmarg
+ value="-DbuildId=${buildId}"/>
+ <jvmarg
+ value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg
+ value="-Dbuild.distribution=${build.distribution}"/>
+ <jvmarg
+ value="-DbuildDirectory=${buildDirectory}"/>
+ <jvmarg
+ value="-Dwtp.builder.home=${wtp.builder.home}"/>
+ <jvmarg
+ value="-Dprojectname=${projectname}"/>
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+ <jvmarg
+ value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
+ <jvmarg
+ value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
+ <arg
+ value="-data"/>
+ <arg
+ value="${basedir}/workspace"/>
+ <arg
+ value="-application"/>
+ <arg
+ value="org.eclipse.ant.core.antRunner"/>
+ <arg
+ value="-buildfile"/>
+ <arg
+ value="${ant.file}"/>
+ <arg
+ value="publish"/>
</java>
</target>
-
- <!-- ===================================================================== -->
+ <!--
+ =====================================================================
+ -->
<!-- Steps to do to publish the build results -->
- <!-- ===================================================================== -->
- <target name="publish">
+ <!--
+ =====================================================================
+ -->
+ <target
+ name="publish">
<dirname
file="${ant.file}"
- property="component.dir" />
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
-
+ property="component.dir"/>
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+ <property
+ file="${buildDirectory}/label.properties"/>
<property
name="publish.xml"
- value="${component.dir}/publish.xml" />
-
+ value="${component.dir}/publish.xml"/>
<property
name="indexFileName"
- value="index.php" />
+ value="index.php"/>
<property
name="result"
- value="${buildDirectory}/${buildLabel}" />
+ value="${buildDirectory}/${buildLabel}"/>
<property
name="indexTemplateFilename"
- value="index.html.template.php" />
-
- <!-- not used or needed, and messes up "drill down" on some servers
- <copy
+ value="index.html.template.php"/>
+ <!--
+ not used or needed, and messes up "drill down" on some
+ servers <copy
file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
tofile="${buildDirectory}/${indexFileName}" />
- -->
-
+ -->
<condition
property="isBuildTested"
value="true">
<available
- file="${buildDirectory}/${buildLabel}/testResults/html" />
+ file="${buildDirectory}/${buildLabel}/testResults/html"/>
</condition>
-
<ant
antfile="${publish.xml}"
dir="${component.dir}">
<property
name="dropTokenList"
- value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
+ value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
<property
name="webtoolsDownloadURL"
- value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
-
+ value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<property
name="buildBranch"
- value="${buildBranch}" />
+ value="${buildBranch}"/>
<property
name="isBuildTested"
- value="${isBuildTested}" />
+ value="${isBuildTested}"/>
<property
name="indexTemplateFilename"
- value="${indexTemplateFilename}" />
+ value="${indexTemplateFilename}"/>
</ant>
<!-- Get the build map over for the results to point to. -->
<copy
file="${buildDirectory}/directory.txt"
- tofile="${result}/directory.txt" />
+ tofile="${result}/directory.txt"/>
<!-- Copy info for build identification -->
<copy
file="${buildDirectory}/buildmachineinfo.properties"
- tofile="${result}/buildmachineinfo.properties" />
+ tofile="${result}/buildmachineinfo.properties"/>
- <!-- http access logs -->
- <copy todir="${result}/" failonerror="false">
- <fileset dir="${buildDirectory}" includes="*.log" />
- </copy>
-
- <!-- ant build log, from control directory -->
- <copy todir="${result}/" failonerror="false">
- <fileset dir="${env.ANT_WORKING}/${projectname}" includes="antBuilderOutput.log" />
- </copy>
-
+ <!-- http access logs -->
+ <copy
+ todir="${result}/"
+ failonerror="false">
+ <fileset
+ dir="${buildDirectory}"
+ includes="*.log"/>
+ </copy>
+
+ <!-- ant build log, from control directory -->
+ <copy
+ todir="${result}/"
+ failonerror="false">
+ <fileset
+ dir="${env.ANT_WORKING}/${projectname}"
+ includes="antBuilderOutput.log"/>
+ </copy>
+
<!-- final count files -->
<countBuildFiles
sourceDirectory="${buildDirectory}/${buildLabel}"
filterString=".zip,.tar.gz"
- outputFile="${buildDirectory}/${buildLabel}/files.count" />
-
+ outputFile="${buildDirectory}/${buildLabel}/files.count"/>
</target>
-
-
-</project>
+</project>
\ No newline at end of file