From 14cadd1c07b9e485f5ab42098eb7a643e455787c Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 23 Mar 2011 06:43:39 +0000
Subject: [PATCH] cleanup logging
---
releng.control/cc_project_build.xml | 4 +-
releng.control/checkout.xml | 19 +-
releng.control/process-artifacts.xml | 2 +-
releng.wtpbuilder/build.xml | 82 ++++---
.../distribution/template.build/build.xml | 2 +-
.../distribution/template.site/build.xml | 2 +-
.../distribution/template.tests/build.xml | 2 +-
.../components/jsdt_sdk/customTargets.xml | 204 +++++++++---------
.../components/jsdt_tests/customTargets.xml | 150 ++++++-------
.../components/jst-sdk/customTargets.xml | 166 +++++++-------
.../components/jst.tests/customTargets.xml | 100 +++++----
.../components/jst4x-sdk/customTargets.xml | 166 +++++++-------
.../components/jst4x.tests/customTargets.xml | 100 +++++----
.../components/wst-sdk/customTargets.xml | 163 ++++++++------
.../components/wst.tests/customTargets.xml | 98 +++++----
.../components/wst4x-sdk/customTargets.xml | 164 +++++++-------
.../components/wst4x.tests/customTargets.xml | 98 +++++----
.../wtp-buildTools/customTargets.xml | 98 +++++----
.../distribution/dali.site/build.xml | 2 +-
.../distribution/dali.site/publish.xml | 4 +-
.../distribution/dali.tests/build.xml | 1 +
.../distribution/jsdt.build/build.xml | 2 +-
.../distribution/jsdt.site/build.xml | 2 +-
.../distribution/jsdt.site/publish.xml | 4 +-
.../distribution/jsdt.tests/build.xml | 13 +-
.../distribution/wtp.build/build.xml | 2 +-
.../wtp.package/createfprojzips.xml | 4 +
.../distribution/wtp.site/build.xml | 2 +-
.../distribution/wtp.site/publish.xml | 4 +-
.../distribution/wtp.tests/build.xml | 13 +-
.../distribution/wtp.tests/perfbuild.xml | 1 +
.../distribution/wtp4x.build/build.xml | 2 +-
.../distribution/wtp4x.site/build.xml | 2 +-
.../distribution/wtp4x.site/publish.xml | 4 +-
.../distribution/wtp4x.tests/build.xml | 13 +-
.../wtpbuildTools.build/build.xml | 2 +-
.../distribution/wtpcap.build/build.xml | 2 +-
.../distribution/wtpcap.site/build.xml | 2 +-
.../distribution/wtpcap.site/publish.xml | 4 +-
.../antrunner/process-artifacts-320.xml | 2 +-
.../antrunner/process-artifacts-321.xml | 2 +-
.../antrunner/process-artifacts-322.xml | 2 +-
.../antrunner/process-artifacts-330.xml | 2 +-
.../antrunner/testHeliosMirror.xml | 2 +-
.../antrunner/testMirror.xml | 2 +-
.../scripts/build/buildutilitiesp2.xml | 26 +--
.../scripts/build/checkForFastFail.xml | 7 +-
.../scripts/build/customizeAccessRules.xml | 2 +-
releng.wtpbuilder/scripts/build/label.xml | 6 +-
releng.wtpbuilder/scripts/build/maptasks.xml | 18 +-
.../scripts/build/runAntRunner.xml | 2 +-
.../scripts/build/runAppRunner.xml | 2 +-
releng.wtpbuilder/scripts/build/runbuild.xml | 16 +-
releng.wtpbuilder/scripts/build/signjars.xml | 16 +-
.../scripts/dependency/build.xml | 16 --
.../scripts/dependency/dependency.xml | 20 +-
.../scripts/dependency/template.xml | 35 +--
.../standaloneTest/standalonePerfTest.xml | 9 +-
.../scripts/standaloneTest/standaloneTest.xml | 2 +-
.../standaloneTest/standalonecheckout.xml | 4 +-
60 files changed, 1054 insertions(+), 844 deletions(-)
diff --git a/releng.control/cc_project_build.xml b/releng.control/cc_project_build.xml
index edb80b686..6ac399025 100644
--- a/releng.control/cc_project_build.xml
+++ b/releng.control/cc_project_build.xml
@@ -119,6 +119,7 @@
name="doTestPhase"
unless="skipUnitTests">
<delete
+ quiet="true"
dir="${env.PROJECT_TESTS}/${projectname}"
failonerror="false"/>
<ant
@@ -146,10 +147,11 @@
name="clean"
depends="check.clean"
if="doClean">
- <delete
+ <delete quiet="true"
dir="${env.PROJECT_PROJECTS}/${projectname}"
failonerror="false"/>
<delete
+ quiet="true"
dir="${env.PROJECT_TESTS}/${projectname}"
failonerror="false"/>
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 77b1f2e2b..d92df027c 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -7,17 +7,18 @@
<!-- main -->
<target
name="checkout"
- depends="init"
+ depends="init, getBuilderVersion"
if="projectname">
- <!-- we always check and init the builder -->
- <antcall target="getbuilder"/>
+
+ <echo message="Version tag for ${env.RELENG}: ${mapVersionTag}"/>
+
</target>
<!--
The order of execution of these three worker targets is
critical, check.clean, initBuilders, and then getbuilder.
-->
<target
- name="getbuilder"
+ name="getBuilderVersion"
depends="init,check.clean,initBuilders"
if="doClean">
<!--
@@ -29,14 +30,6 @@
<fail
unless="builderVersion"
message="Could not get builderVersion. Probably could not checkout build.cfg"/>
- <!--
- deleting WTP builder project location: <BUILD
- HOME>/projectBuilders/<project>/webtools.releng/releng.wtpbuilder
- Note: should no longer need to be deleted here, since we now delete whole codir in 'init'.
- <delete
- dir="${codir}/${env.RELENG_BUILDER}"
- failonerror="false"/>
- -->
<!--
Get a new version of the wtpbuild project from CVS, version
comes from build.cfg map file
@@ -82,7 +75,7 @@
dir="${codir}"
failonerror="false"/>
<mkdir dir="${codir}"/>
- <echo message="Version tag for ${env.RELENG}: ${mapVersionTag}"/>
+
<cvs
reallyquiet="${env.CVS_REALLY_QUIET}"
cvsRoot="${mapCvsRoot}"
diff --git a/releng.control/process-artifacts.xml b/releng.control/process-artifacts.xml
index d09f8125b..28ec97506 100644
--- a/releng.control/process-artifacts.xml
+++ b/releng.control/process-artifacts.xml
@@ -12,7 +12,7 @@
repositoryPath="file:/${repoDirLocation}"/>
<!-- clean up some unnecessary files -->
- <delete failonerror="false">
+ <delete failonerror="false" quiet="true">
<fileset
dir="${repoDirLocation}"
includes="artifacts.jar.pack.gz, content.jar.pack.gz, site.xml"/>
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index ecf82b2c6..7d7f49d40 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -3,38 +3,6 @@
default="build"
basedir=".">
- <!-- = = = standard properties pattern = = = -->
- <!--
- 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.
- -->
- <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
- <property
- name="keyCfgFile"
- value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
- <echo
- level="debug"
- message="keyCfgFile: ${keyCfgFile}"/>
- <property file="${keyCfgFile}"/>
-
- <!-- TODO: I don't think this is loaded here. Wrong basedir? -->
- <property file="${ant.project.name}.properties"/>
-
-
- <!-- = = = end standard properties pattern = = = -->
- <fail
- unless="build.distribution"
- message="build.distribution must be specified"/>
- <echo message="build.distribution: ${build.distribution}"/>
<!-- main -->
<target
@@ -44,7 +12,10 @@
<!-- remove eclipse builder at start of every major build, so it will be reinstalled -->
- <delete dir="${eclipse.builder.base.install.dir}" />
+ <delete
+ failonerror="true"
+ quiet="true"
+ dir="${eclipse.builder.base.install.dir}"/>
<property
name="buildfile"
@@ -109,7 +80,45 @@
3) check for existence of build.xml file for each of the build,
test, upload, site distribution locations and set properties
-->
- <target name="init">
+ <target
+ name="init"
+ unless="buildInitialized">
+
+
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ 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.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
+ <property
+ name="keyCfgFile"
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+ <echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}"/>
+ <property file="${keyCfgFile}"/>
+
+ <!-- TODO: I don't think this is loaded here. Wrong basedir? -->
+ <property file="${ant.project.name}.properties"/>
+
+
+ <!-- = = = end standard properties pattern = = = -->
+ <fail
+ unless="build.distribution"
+ message="build.distribution must be specified"/>
+ <echo message="build.distribution: ${build.distribution}"/>
+
+
<dirname
file="${ant.file}"
property="wtp.builder.home"/>
@@ -175,5 +184,10 @@
arg1="${buildType}"
arg2="N"/>
</condition>
+
+ <property
+ name="buildInitialized"
+ value="true"/>
+
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
index 796f764d6..1788d56e5 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
@@ -21,7 +21,7 @@
<!-- calling label.xml to createg label.properties file -->
<ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
<echo
- level="info"
+ level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
<ant antfile="${buildTargets}">
<property
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index 0455f5c31..2a4884592 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -18,7 +18,7 @@
<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}"/>
<condition
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index c690940a9..fb1549b2d 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -60,7 +60,7 @@
<mkdir dir="${testRoot}"/>
<!-- if results already exist, delete them -->
- <delete
+ <delete quiet="true"
dir="${testRoot}/results"
failOnError="false"/>
<mkdir dir="${testRoot}/results"/>
diff --git a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
index d0bf65258..4cb4dc7b5 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
@@ -2,7 +2,7 @@
name="PDECustomTargets"
default="noDefault"
basedir=".">
- <!--
+ <!--
= = = standard properties pattern = = = Note to be
cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case
@@ -11,14 +11,14 @@
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.
-->
<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
- <!-- let this project specify properties, if not already set -->
+ <!-- let this project specify properties, if not already set -->
<property file="build.properties"/>
<fail
message="dependency.properties must be specified by distribution script"
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -52,10 +52,7 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
- <!--
+ <!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
@@ -67,90 +64,51 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
- <!--
+ <!--
Check out map files from repository
- -->
+ -->
<target name="getMapFiles">
+ <!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
- target="maputil">
- <property
- name="mapcomponent"
- value="${env.RELENG}"/>
- <property
- name="mapTag"
- value="${mapVersionTag}"/>
- </ant>
- <ant
- antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
- target="maputil">
- <property
- name="mapcomponent"
- value="${env.RELENGJSDT}"/>
- <property
- name="mapTag"
- value="${releng.jsdt-mapVersionTag}"/>
- </ant>
+ target="fetchAllMaps"/>
</target>
- <!--
+ <!--
Steps to do before setup
-->
<target name="preSetup">
</target>
- <!--
+ <!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
- <!-- Get the dependencies -->
+
+ <!-- Get the dependencies -->
<antcall target="getDependencies"/>
<antcall target="updateCategoriesFiles"/>
</target>
- <!--
+ <!--
=====================================================================
-->
- <!-- Get the dependencies based on releng maps -->
- <!--
+ <!-- Get the dependencies based on releng maps -->
+ <!--
=====================================================================
-->
<target name="getDependencies">
@@ -167,8 +125,8 @@
</ant>
</target>
- <!--
- Steps to do before fetching the build elements
+ <!--
+ Steps to do before fetching the build elements
-->
<target name="preFetch">
</target>
@@ -176,33 +134,32 @@
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="unrewriteMaps"/>
-
</target>
- <!--
+ <!--
Steps to do before the repositories are being processed
-->
<target name="preProcessRepos">
</target>
- <!--
+ <!--
Steps to do after the repositories have been processed
-->
<target name="postProcessRepos">
</target>
- <!--
- Steps to do before generating the build scripts.
+ <!--
+ Steps to do before generating the build scripts.
-->
<target name="preGenerate">
</target>
- <!--
- Steps to do after generating the build scripts.
+ <!--
+ Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
</target>
- <!--
+ <!--
Steps to do before running the build.xmls for the elements being
built.
-->
@@ -214,7 +171,7 @@
<include name="**/about.mappings"/>
</replace>
</target>
- <!--
+ <!--
Steps to do after running the build.xmls for the elements being
built.
-->
@@ -225,13 +182,13 @@
<antcall target="gatherLogs"/>
</target>
- <!-- Steps to do before running assemble. -->
+ <!-- Steps to do before running assemble. -->
<target name="preAssemble">
</target>
- <!--
+ <!--
Steps to do after running assemble.
- -->
+ -->
<target name="postAssemble">
<ant
@@ -243,44 +200,43 @@
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="prePackage">
</target>
- <!-- Steps to do after running package. -->
+ <!-- Steps to do after running package. -->
<target name="postPackage">
</target>
- <!--
- Steps to do after the build is done.
+ <!--
+ Steps to do after the build is done.
-->
<target name="postBuild">
</target>
- <!--
- Steps to do to test the build results
+ <!--
+ Steps to do to test the build results
-->
<target name="test">
</target>
- <!--
- Steps to do to publish the build results
+ <!--
+ Steps to do to publish the build results
-->
<target name="publish">
</target>
- <!--
- Helper targets
+ <!--
+ Helper targets
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -296,16 +252,17 @@
<include name="**/*.log.zip"/>
</fileset>
</unzip>
- <!--
+ <!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-->
+
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
- <!--
+ <!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
@@ -324,6 +281,7 @@
to="/\2/\3bin.xml"/>
</compositemapper>
</copy>
+
</target>
<target
name="clean"
@@ -335,7 +293,7 @@
</antcall>
</target>
- <!--
+ <!--
Note: buildId is typically of the form "3.3.0"
may want to use buildLabel, which is of form I-3.3.0-20100912032913
-->
@@ -356,15 +314,63 @@
<available
file="${p2.category.definition.file}"
property="categoryFileExists"/>
- </target>
+ </target>
- <!--
- Default target
+ <!--
+ Default target
-->
<target name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
index 3e60fae08..3ee0ff646 100644
--- a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -52,9 +52,6 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -67,61 +64,26 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
- <!--
+ <!--
Check out map files from repository
-->
<target name="getMapFiles">
+
+ <!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
- target="maputil">
- <property
- name="mapcomponent"
- value="${env.RELENG}"/>
- <property
- name="mapTag"
- value="${mapVersionTag}"/>
- </ant>
- <ant
- antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
- target="maputil">
- <property
- name="mapcomponent"
- value="${env.RELENGJSDT}"/>
- <property
- name="mapTag"
- value="${releng.jsdt-mapVersionTag}"/>
- </ant>
+ target="fetchAllMaps"/>
</target>
- <!--
+ <!--
Steps to do before setup
-->
<target name="preSetup">
@@ -129,16 +91,12 @@
<!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall target="getDependencies"/>
@@ -167,7 +125,7 @@
</target>
<!--
- Steps to do before fetching the build elements
+ Steps to do before fetching the build elements
-->
<target name="preFetch">
</target>
@@ -177,25 +135,25 @@
target="unrewriteMaps"/>
</target>
- <!--
+ <!--
Steps to do before the repositories are being processed
-->
<target name="preProcessRepos">
</target>
- <!--
+ <!--
Steps to do after the repositories have been processed
-->
<target name="postProcessRepos">
</target>
<!--
- Steps to do before generating the build scripts.
+ Steps to do before generating the build scripts.
-->
<target name="preGenerate">
</target>
<!--
- Steps to do after generating the build scripts.
+ Steps to do after generating the build scripts.
-->
<target name="postGenerate">
@@ -230,7 +188,7 @@
<!--
Steps to do after running assemble.
- -->
+ -->
<target name="postAssemble">
<ant
@@ -253,33 +211,32 @@
</target>
<!--
- Steps to do after the build is done.
+ Steps to do after the build is done.
-->
<target name="postBuild">
</target>
<!--
- Steps to do to test the build results
+ Steps to do to test the build results
-->
<target name="test">
</target>
<!--
- Steps to do to publish the build results
+ Steps to do to publish the build results
-->
<target name="publish">
</target>
<!--
- Helper targets
+ Helper targets
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -301,6 +258,7 @@
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-->
+
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
@@ -309,8 +267,7 @@
structure, to include directory for name of plugin
-->
<fileset dir="${buildDirectory}/features/">
- <include name="**/feature.temp.folder/"/>
- <exclude name="**/*tests*feature*/feature.temp.folder/"/>
+ <include name="**/*tests*feature*/feature.temp.folder/"/>
</fileset>
<compositemapper>
<mapper
@@ -323,6 +280,7 @@
to="/\2/\3bin.xml"/>
</compositemapper>
</copy>
+
</target>
<target
name="clean"
@@ -359,11 +317,59 @@
<!--
- Default target
+ Default target
-->
<target name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index 9c0378727..4cb4dc7b5 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -2,7 +2,7 @@
name="PDECustomTargets"
default="noDefault"
basedir=".">
- <!--
+ <!--
= = = standard properties pattern = = = Note to be
cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case
@@ -11,14 +11,14 @@
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.
-->
<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
- <!-- let this project specify properties, if not already set -->
+ <!-- let this project specify properties, if not already set -->
<property file="build.properties"/>
<fail
message="dependency.properties must be specified by distribution script"
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -42,6 +42,8 @@
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
+
+
<property
name="p2.category.definition.file"
value="${buildDirectory}/maps/${env.RELENG}/components/${component}/category.xml"/>
@@ -50,10 +52,7 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
- <!--
+ <!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
@@ -65,74 +64,51 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
- <!--
+ <!--
Check out map files from repository
-->
<target name="getMapFiles">
- <!-- for now, get all, at once. May componetize later. -->
+ <!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps"/>
</target>
- <!--
+ <!--
Steps to do before setup
-->
<target name="preSetup">
</target>
- <!--
+ <!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
- <!-- Get the dependencies -->
+
+ <!-- Get the dependencies -->
<antcall target="getDependencies"/>
<antcall target="updateCategoriesFiles"/>
</target>
- <!--
+ <!--
=====================================================================
-->
- <!-- Get the dependencies based on releng maps -->
- <!--
+ <!-- Get the dependencies based on releng maps -->
+ <!--
=====================================================================
-->
<target name="getDependencies">
@@ -149,7 +125,7 @@
</ant>
</target>
- <!--
+ <!--
Steps to do before fetching the build elements
-->
<target name="preFetch">
@@ -158,33 +134,32 @@
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="unrewriteMaps"/>
-
</target>
- <!--
+ <!--
Steps to do before the repositories are being processed
-->
<target name="preProcessRepos">
</target>
- <!--
+ <!--
Steps to do after the repositories have been processed
-->
<target name="postProcessRepos">
</target>
- <!--
+ <!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate">
</target>
- <!--
+ <!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
</target>
- <!--
+ <!--
Steps to do before running the build.xmls for the elements being
built.
-->
@@ -196,7 +171,7 @@
<include name="**/about.mappings"/>
</replace>
</target>
- <!--
+ <!--
Steps to do after running the build.xmls for the elements being
built.
-->
@@ -207,11 +182,11 @@
<antcall target="gatherLogs"/>
</target>
- <!-- Steps to do before running assemble. -->
+ <!-- Steps to do before running assemble. -->
<target name="preAssemble">
</target>
- <!--
+ <!--
Steps to do after running assemble.
-->
<target name="postAssemble">
@@ -225,44 +200,43 @@
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="prePackage">
</target>
- <!-- Steps to do after running package. -->
+ <!-- Steps to do after running package. -->
<target name="postPackage">
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="postBuild">
</target>
- <!--
+ <!--
Steps to do to test the build results
-->
<target name="test">
</target>
- <!--
+ <!--
Steps to do to publish the build results
-->
<target name="publish">
</target>
- <!--
+ <!--
Helper targets
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -278,7 +252,7 @@
<include name="**/*.log.zip"/>
</fileset>
</unzip>
- <!--
+ <!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
@@ -288,7 +262,7 @@
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
- <!--
+ <!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
@@ -319,7 +293,7 @@
</antcall>
</target>
- <!--
+ <!--
Note: buildId is typically of the form "3.3.0"
may want to use buildLabel, which is of form I-3.3.0-20100912032913
-->
@@ -340,10 +314,10 @@
<available
file="${p2.category.definition.file}"
property="categoryFileExists"/>
- </target>
+ </target>
- <!--
+ <!--
Default target
-->
<target name="noDefault">
@@ -351,4 +325,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index 3d1030880..3ee0ff646 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -42,6 +42,8 @@
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
+
+
<property
name="p2.category.definition.file"
value="${buildDirectory}/maps/${env.RELENG}/components/${component}/category.xml"/>
@@ -50,9 +52,6 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -65,30 +64,10 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
@@ -112,16 +91,12 @@
<!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall target="getDependencies"/>
@@ -258,11 +233,10 @@
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -350,4 +324,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml b/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml
index 9c0378727..4cb4dc7b5 100644
--- a/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml
@@ -2,7 +2,7 @@
name="PDECustomTargets"
default="noDefault"
basedir=".">
- <!--
+ <!--
= = = standard properties pattern = = = Note to be
cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case
@@ -11,14 +11,14 @@
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.
-->
<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
- <!-- let this project specify properties, if not already set -->
+ <!-- let this project specify properties, if not already set -->
<property file="build.properties"/>
<fail
message="dependency.properties must be specified by distribution script"
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -42,6 +42,8 @@
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
+
+
<property
name="p2.category.definition.file"
value="${buildDirectory}/maps/${env.RELENG}/components/${component}/category.xml"/>
@@ -50,10 +52,7 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
- <!--
+ <!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
@@ -65,74 +64,51 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
- <!--
+ <!--
Check out map files from repository
-->
<target name="getMapFiles">
- <!-- for now, get all, at once. May componetize later. -->
+ <!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps"/>
</target>
- <!--
+ <!--
Steps to do before setup
-->
<target name="preSetup">
</target>
- <!--
+ <!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
- <!-- Get the dependencies -->
+
+ <!-- Get the dependencies -->
<antcall target="getDependencies"/>
<antcall target="updateCategoriesFiles"/>
</target>
- <!--
+ <!--
=====================================================================
-->
- <!-- Get the dependencies based on releng maps -->
- <!--
+ <!-- Get the dependencies based on releng maps -->
+ <!--
=====================================================================
-->
<target name="getDependencies">
@@ -149,7 +125,7 @@
</ant>
</target>
- <!--
+ <!--
Steps to do before fetching the build elements
-->
<target name="preFetch">
@@ -158,33 +134,32 @@
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="unrewriteMaps"/>
-
</target>
- <!--
+ <!--
Steps to do before the repositories are being processed
-->
<target name="preProcessRepos">
</target>
- <!--
+ <!--
Steps to do after the repositories have been processed
-->
<target name="postProcessRepos">
</target>
- <!--
+ <!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate">
</target>
- <!--
+ <!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
</target>
- <!--
+ <!--
Steps to do before running the build.xmls for the elements being
built.
-->
@@ -196,7 +171,7 @@
<include name="**/about.mappings"/>
</replace>
</target>
- <!--
+ <!--
Steps to do after running the build.xmls for the elements being
built.
-->
@@ -207,11 +182,11 @@
<antcall target="gatherLogs"/>
</target>
- <!-- Steps to do before running assemble. -->
+ <!-- Steps to do before running assemble. -->
<target name="preAssemble">
</target>
- <!--
+ <!--
Steps to do after running assemble.
-->
<target name="postAssemble">
@@ -225,44 +200,43 @@
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="prePackage">
</target>
- <!-- Steps to do after running package. -->
+ <!-- Steps to do after running package. -->
<target name="postPackage">
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="postBuild">
</target>
- <!--
+ <!--
Steps to do to test the build results
-->
<target name="test">
</target>
- <!--
+ <!--
Steps to do to publish the build results
-->
<target name="publish">
</target>
- <!--
+ <!--
Helper targets
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -278,7 +252,7 @@
<include name="**/*.log.zip"/>
</fileset>
</unzip>
- <!--
+ <!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
@@ -288,7 +262,7 @@
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
- <!--
+ <!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
@@ -319,7 +293,7 @@
</antcall>
</target>
- <!--
+ <!--
Note: buildId is typically of the form "3.3.0"
may want to use buildLabel, which is of form I-3.3.0-20100912032913
-->
@@ -340,10 +314,10 @@
<available
file="${p2.category.definition.file}"
property="categoryFileExists"/>
- </target>
+ </target>
- <!--
+ <!--
Default target
-->
<target name="noDefault">
@@ -351,4 +325,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jst4x.tests/customTargets.xml b/releng.wtpbuilder/components/jst4x.tests/customTargets.xml
index 3d1030880..3ee0ff646 100644
--- a/releng.wtpbuilder/components/jst4x.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst4x.tests/customTargets.xml
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -42,6 +42,8 @@
<property
name="p2.build.repo"
value="file://${p2buildrepoDirectory}/"/>
+
+
<property
name="p2.category.definition.file"
value="${buildDirectory}/maps/${env.RELENG}/components/${component}/category.xml"/>
@@ -50,9 +52,6 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -65,30 +64,10 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
@@ -112,16 +91,12 @@
<!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall target="getDependencies"/>
@@ -258,11 +233,10 @@
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -350,4 +324,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 0bd2b7985..4cb4dc7b5 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -2,7 +2,7 @@
name="PDECustomTargets"
default="noDefault"
basedir=".">
- <!--
+ <!--
= = = standard properties pattern = = = Note to be
cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case
@@ -11,14 +11,14 @@
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.
-->
<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
- <!-- let this project specify properties, if not already set -->
+ <!-- let this project specify properties, if not already set -->
<property file="build.properties"/>
<fail
message="dependency.properties must be specified by distribution script"
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -52,10 +52,7 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
- <!--
+ <!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
@@ -67,74 +64,51 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
- <!--
+ <!--
Check out map files from repository
-->
<target name="getMapFiles">
- <!-- for now, get all, at once. May componetize later. -->
+ <!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps"/>
</target>
- <!--
+ <!--
Steps to do before setup
-->
<target name="preSetup">
</target>
- <!--
+ <!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
- <!-- Get the dependencies -->
+
+ <!-- Get the dependencies -->
<antcall target="getDependencies"/>
<antcall target="updateCategoriesFiles"/>
</target>
- <!--
+ <!--
=====================================================================
-->
- <!-- Get the dependencies based on releng maps -->
- <!--
+ <!-- Get the dependencies based on releng maps -->
+ <!--
=====================================================================
-->
<target name="getDependencies">
@@ -151,7 +125,7 @@
</ant>
</target>
- <!--
+ <!--
Steps to do before fetching the build elements
-->
<target name="preFetch">
@@ -161,31 +135,31 @@
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="unrewriteMaps"/>
</target>
- <!--
+ <!--
Steps to do before the repositories are being processed
-->
<target name="preProcessRepos">
</target>
- <!--
+ <!--
Steps to do after the repositories have been processed
-->
<target name="postProcessRepos">
</target>
- <!--
+ <!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate">
</target>
- <!--
+ <!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
</target>
- <!--
+ <!--
Steps to do before running the build.xmls for the elements being
built.
-->
@@ -197,7 +171,7 @@
<include name="**/about.mappings"/>
</replace>
</target>
- <!--
+ <!--
Steps to do after running the build.xmls for the elements being
built.
-->
@@ -208,11 +182,11 @@
<antcall target="gatherLogs"/>
</target>
- <!-- Steps to do before running assemble. -->
+ <!-- Steps to do before running assemble. -->
<target name="preAssemble">
</target>
- <!--
+ <!--
Steps to do after running assemble.
-->
<target name="postAssemble">
@@ -226,44 +200,43 @@
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="prePackage">
</target>
- <!-- Steps to do after running package. -->
+ <!-- Steps to do after running package. -->
<target name="postPackage">
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="postBuild">
</target>
- <!--
+ <!--
Steps to do to test the build results
-->
<target name="test">
</target>
- <!--
+ <!--
Steps to do to publish the build results
-->
<target name="publish">
</target>
- <!--
+ <!--
Helper targets
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -279,7 +252,7 @@
<include name="**/*.log.zip"/>
</fileset>
</unzip>
- <!--
+ <!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
@@ -289,7 +262,7 @@
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
- <!--
+ <!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
@@ -320,7 +293,7 @@
</antcall>
</target>
-<!--
+ <!--
Note: buildId is typically of the form "3.3.0"
may want to use buildLabel, which is of form I-3.3.0-20100912032913
-->
@@ -341,10 +314,10 @@
<available
file="${p2.category.definition.file}"
property="categoryFileExists"/>
- </target>
+ </target>
- <!--
+ <!--
Default target
-->
<target name="noDefault">
@@ -352,4 +325,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index 36c8f9007..3ee0ff646 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -52,9 +52,6 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -67,30 +64,10 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
@@ -114,16 +91,12 @@
<!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall target="getDependencies"/>
@@ -260,11 +233,10 @@
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -352,4 +324,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml b/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml
index 6bf5adbe7..4cb4dc7b5 100644
--- a/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml
@@ -2,7 +2,7 @@
name="PDECustomTargets"
default="noDefault"
basedir=".">
- <!--
+ <!--
= = = standard properties pattern = = = Note to be
cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case
@@ -11,14 +11,14 @@
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.
-->
<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
- <!-- let this project specify properties, if not already set -->
+ <!-- let this project specify properties, if not already set -->
<property file="build.properties"/>
<fail
message="dependency.properties must be specified by distribution script"
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -52,10 +52,7 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
- <!--
+ <!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
-->
@@ -67,74 +64,51 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
- <!--
+ <!--
Check out map files from repository
-->
<target name="getMapFiles">
- <!-- for now, get all, at once. May componetize later. -->
+ <!-- for now, get all, at once. May componetize later. -->
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="fetchAllMaps"/>
</target>
- <!--
+ <!--
Steps to do before setup
-->
<target name="preSetup">
</target>
- <!--
+ <!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
- <!-- Get the dependencies -->
+
+ <!-- Get the dependencies -->
<antcall target="getDependencies"/>
<antcall target="updateCategoriesFiles"/>
</target>
- <!--
+ <!--
=====================================================================
-->
- <!-- Get the dependencies based on releng maps -->
- <!--
+ <!-- Get the dependencies based on releng maps -->
+ <!--
=====================================================================
-->
<target name="getDependencies">
@@ -151,7 +125,7 @@
</ant>
</target>
- <!--
+ <!--
Steps to do before fetching the build elements
-->
<target name="preFetch">
@@ -160,33 +134,32 @@
<ant
antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
target="unrewriteMaps"/>
-
</target>
- <!--
+ <!--
Steps to do before the repositories are being processed
-->
<target name="preProcessRepos">
</target>
- <!--
+ <!--
Steps to do after the repositories have been processed
-->
<target name="postProcessRepos">
</target>
- <!--
+ <!--
Steps to do before generating the build scripts.
-->
<target name="preGenerate">
</target>
- <!--
+ <!--
Steps to do after generating the build scripts.
-->
<target name="postGenerate">
<ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
</target>
- <!--
+ <!--
Steps to do before running the build.xmls for the elements being
built.
-->
@@ -198,7 +171,7 @@
<include name="**/about.mappings"/>
</replace>
</target>
- <!--
+ <!--
Steps to do after running the build.xmls for the elements being
built.
-->
@@ -209,11 +182,11 @@
<antcall target="gatherLogs"/>
</target>
- <!-- Steps to do before running assemble. -->
+ <!-- Steps to do before running assemble. -->
<target name="preAssemble">
</target>
- <!--
+ <!--
Steps to do after running assemble.
-->
<target name="postAssemble">
@@ -227,44 +200,43 @@
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="prePackage">
</target>
- <!-- Steps to do after running package. -->
+ <!-- Steps to do after running package. -->
<target name="postPackage">
</target>
- <!--
+ <!--
Steps to do after the build is done.
-->
<target name="postBuild">
</target>
- <!--
+ <!--
Steps to do to test the build results
-->
<target name="test">
</target>
- <!--
+ <!--
Steps to do to publish the build results
-->
<target name="publish">
</target>
- <!--
+ <!--
Helper targets
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -280,7 +252,7 @@
<include name="**/*.log.zip"/>
</fileset>
</unzip>
- <!--
+ <!--
workaround: see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
@@ -290,7 +262,7 @@
<copy
todir="${buildDirectory}/${buildLabel}/${compilelogsDir}/plugins"
overwrite="true">
- <!--
+ <!--
we want all @dot.xml files, but assumes a certain
structure, to include directory for name of plugin
-->
@@ -321,7 +293,7 @@
</antcall>
</target>
- <!--
+ <!--
Note: buildId is typically of the form "3.3.0"
may want to use buildLabel, which is of form I-3.3.0-20100912032913
-->
@@ -342,10 +314,10 @@
<available
file="${p2.category.definition.file}"
property="categoryFileExists"/>
- </target>
+ </target>
- <!--
+ <!--
Default target
-->
<target name="noDefault">
@@ -353,4 +325,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wst4x.tests/customTargets.xml b/releng.wtpbuilder/components/wst4x.tests/customTargets.xml
index 36c8f9007..3ee0ff646 100644
--- a/releng.wtpbuilder/components/wst4x.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst4x.tests/customTargets.xml
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -52,9 +52,6 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
-
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -67,30 +64,10 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
@@ -114,16 +91,12 @@
<!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall target="getDependencies"/>
@@ -260,11 +233,10 @@
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -352,4 +324,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
index 32173a189..9e3c1a229 100644
--- a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
@@ -26,7 +26,7 @@
<fail
unless="buildDirectory"
message="buildDirectory must be set"/>
- <echo message="buildDirectory: ${buildDirectory}"/>
+
<property
name="archiveName"
value="${component}-buildrepo-${buildLabel}.zip"/>
@@ -50,9 +50,6 @@
name="p2.category.definition"
value="file:/${p2.category.definition.file}"/>
- <echo message="p2.build.repo: ${p2.build.repo}"/>
- <echo message="p2.category.definition: ${p2.category.definition}"/>
-
<!--
Run a given ${target} on all elements being built Add on <ant>
task for each top level element being built.
@@ -65,30 +62,10 @@
name="allElementsFile"
location="${eclipse.pdebuild.templates}/headless-build/allElements.xml"/>
<import file="${allElementsFile}"/>
- <target name="allElements">
- <echo
- level="info"
- message="target: ${target} "/>
- <echo
- level="info"
- message="basedir: ${basedir}"/>
- <echo
- level="info"
- message="component: ${component}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
- <echo
- level="info"
- message="baseLocation: ${baseLocation}"/>
- <echo
- level="info"
- message="generic target: ${genericTargets}"/>
- <echo
- level="info"
- message="topLevelElementId: ${topLevelElementId}"/>
- <echo message="compilerArg: ${compilerArg}"/>
- <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <target
+ name="allElements"
+ depends="init">
+
<antcall target="allElementsDelegator"/>
</target>
@@ -111,16 +88,12 @@
<!--
Steps to do after setup but before starting the build proper
-->
- <target name="postSetup">
+ <target
+ name="postSetup"
+ depends="init">
<dirname
file="${ant.file}"
property="component.dir"/>
- <echo
- level="debug"
- message="ant.file: ${ant.file}"/>
- <echo
- level="debug"
- message="component.dir: ${component.dir}"/>
<!-- Get the dependencies -->
<antcall target="getDependencies"/>
@@ -258,11 +231,10 @@
-->
<target
name="gatherLogs"
- if="logsAvailable">
+ if="logsAvailable"
+ depends="init">
<mkdir dir="${buildDirectory}/${buildLabel}/${compilelogsDir}"/>
- <echo
- level="debug"
- message="logExtension: ${logExtension}"/>
+
<antcall target="allElements">
<param
name="target"
@@ -321,4 +293,52 @@
level="error"
message="You must specify a target when invoking this file"/>
</target>
+
+
+ <target
+ name="init"
+ unless="customTargetsInitialized">
+
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo message="p2.category.definition: ${p2.category.definition}"/>
+ <echo
+ level="info"
+ message="target: ${target} "/>
+ <echo
+ level="info"
+ message="basedir: ${basedir}"/>
+ <echo
+ level="info"
+ message="component: ${component}"/>
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+ <echo
+ level="info"
+ message="baseLocation: ${baseLocation}"/>
+ <echo
+ level="info"
+ message="generic target: ${genericTargets}"/>
+ <echo
+ level="info"
+ message="topLevelElementId: ${topLevelElementId}"/>
+ <echo message="compilerArg: ${compilerArg}"/>
+ <echo message="individualSourceBundles: ${individualSourceBundles}"/>
+ <echo
+ level="debug"
+ message="ant.file: ${ant.file}"/>
+ <echo
+ level="debug"
+ message="component.dir: ${component.dir}"/>
+ <echo
+ level="debug"
+ message="logExtension: ${logExtension}"/>
+ <property
+ name="customTargetsInitialized"
+ value="true"/>
+
+
+ </target>
+
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/build.xml b/releng.wtpbuilder/distribution/dali.site/build.xml
index 188d4f8ee..26629a498 100644
--- a/releng.wtpbuilder/distribution/dali.site/build.xml
+++ b/releng.wtpbuilder/distribution/dali.site/build.xml
@@ -17,7 +17,7 @@
<!-- = = = end standard properties pattern = = = -->
- <echo message="ant.file: ${ant.file}"/>
+ <echo level="debug" message="ant.file: ${ant.file}"/>
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 461abf0c0..307a658df 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -53,7 +53,7 @@
<fail
message="dependency file not found: ${dependency.properties}"
unless="dependency.properties.exists"/>
- <echo message="dependency file: ${dependency.properties}"/>
+ <echo level="debug" message="dependency file: ${dependency.properties}"/>
<target name="default">
<copy todir="${resultDir}">
@@ -283,7 +283,7 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
- <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
+ <echo level="debug" message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</target>
<target name="replaceData">
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 76325cbe8..64ca575eb 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -61,6 +61,7 @@
<!-- if results already exist, delete them -->
<delete
+ quiet="true"
dir="${testRoot}/results"
failOnError="false"/>
<mkdir dir="${testRoot}/results"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.build/build.xml b/releng.wtpbuilder/distribution/jsdt.build/build.xml
index 2c6be2186..38574cbe2 100644
--- a/releng.wtpbuilder/distribution/jsdt.build/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.build/build.xml
@@ -35,7 +35,7 @@
<echo
- level="info"
+ level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
<ant antfile="${buildTargets}">
<property
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 53018db29..6b4839d74 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -18,7 +18,7 @@
<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">
<!-- make sure there is a base builder, since we need the launcher -->
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
index 461abf0c0..307a658df 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
@@ -53,7 +53,7 @@
<fail
message="dependency file not found: ${dependency.properties}"
unless="dependency.properties.exists"/>
- <echo message="dependency file: ${dependency.properties}"/>
+ <echo level="debug" message="dependency file: ${dependency.properties}"/>
<target name="default">
<copy todir="${resultDir}">
@@ -283,7 +283,7 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
- <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
+ <echo level="debug" message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</target>
<target name="replaceData">
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index b9c5c80dc..9b7ad8f76 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -17,7 +17,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
- level="info"
+ level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property file="${keyCfgFile}"/>
@@ -61,6 +61,7 @@
<!-- if results already exist, delete them -->
<delete
+ quiet="true"
dir="${testRoot}/results"
failOnError="false"/>
<mkdir dir="${testRoot}/results"/>
@@ -70,7 +71,7 @@
overwrite="true">
<fileset dir="${test.component.dir}/testScripts"/>
</copy>
- <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
+ <echo level="debug" message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
<property
name="dependency.properties"
@@ -90,7 +91,7 @@
<fail
message="test dependency file not found: ${test.dependency}"
unless="test.dependency.exists"/>
- <echo message="test.dependency file: ${test.dependency}"/>
+ <echo level="debug" message="test.dependency file: ${test.dependency}"/>
<ant
antfile="${test.dependency}"
target="get">
@@ -208,7 +209,7 @@
</java>
<!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy,
just in case we need it -->
- <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
+ <echo level="debug" message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
<condition property="p2DirectorInstallFailed">
<not>
@@ -277,7 +278,7 @@
<property
name="eclipse.home"
value="${testRoot}"/>
- <echo message="testTarget: ${testTarget}"/>
+ <echo level="debug" message="testTarget: ${testTarget}"/>
<!--
can not pass in empty values in jvmargs so if not testBundle
specified, we'll pass a junk (unused) value
@@ -433,7 +434,7 @@
<target name="init">
- <echo message="dropinsFolder: ${dropinsFolder} "/>
+ <echo level="debug" message="dropinsFolder: ${dropinsFolder} "/>
<condition
property="install.destination"
value="${testRoot}${dropinsFolder}/"
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index c52b88c25..b0957c55e 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -36,7 +36,7 @@
<echo
- level="info"
+ level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
<ant antfile="${buildTargets}">
diff --git a/releng.wtpbuilder/distribution/wtp.package/createfprojzips.xml b/releng.wtpbuilder/distribution/wtp.package/createfprojzips.xml
index f76714b32..54c6e3d1a 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createfprojzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createfprojzips.xml
@@ -59,6 +59,7 @@
depends="checkFprojConditions"
if="requestedAndAvailable">
<delete
+ quiet="true"
file="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"
failonerror="false"/>
<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip">
@@ -69,6 +70,7 @@
</zipfileset>
</zip>
<delete
+ quiet="true"
file="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip"
failonerror="false"/>
<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip">
@@ -82,6 +84,7 @@
</zipfileset>
</zip>
<delete
+ quiet="true"
file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"
failonerror="false"/>
<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip">
@@ -92,6 +95,7 @@
</zipfileset>
</zip>
<delete
+ quiet="true"
file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip"
failonerror="false"/>
<zip destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip">
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 53018db29..6b4839d74 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -18,7 +18,7 @@
<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">
<!-- make sure there is a base builder, since we need the launcher -->
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index 461abf0c0..b9d78aa92 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -53,7 +53,7 @@
<fail
message="dependency file not found: ${dependency.properties}"
unless="dependency.properties.exists"/>
- <echo message="dependency file: ${dependency.properties}"/>
+ <echo level="debug" message="dependency file: ${dependency.properties}"/>
<target name="default">
<copy todir="${resultDir}">
@@ -283,7 +283,7 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
- <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
+ <echo level="debug" message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</target>
<target name="replaceData">
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 0b4228082..3227847fc 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -17,7 +17,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
- level="info"
+ level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property file="${keyCfgFile}"/>
<!--
@@ -59,6 +59,7 @@
<!-- if results already exist, delete them -->
<delete
+ quiet="true"
dir="${testRoot}/results"
failOnError="false"/>
<mkdir dir="${testRoot}/results"/>
@@ -68,7 +69,7 @@
overwrite="true">
<fileset dir="${test.component.dir}/testScripts"/>
</copy>
- <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
+ <echo level="debug" message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
<property
name="dependency.properties"
@@ -88,7 +89,7 @@
<fail
message="test dependency file not found: ${test.dependency}"
unless="test.dependency.exists"/>
- <echo message="test.dependency file: ${test.dependency}"/>
+ <echo level="debug" message="test.dependency file: ${test.dependency}"/>
<ant
antfile="${test.dependency}"
target="get">
@@ -222,7 +223,7 @@
</java>
<!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy,
just in case we need it -->
- <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
+ <echo level="debug" message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
<condition property="p2DirectorInstallFailed">
<not>
@@ -291,7 +292,7 @@
<property
name="eclipse.home"
value="${testRoot}"/>
- <echo message="testTarget: ${testTarget}"/>
+ <echo level="debug" message="testTarget: ${testTarget}"/>
<!--
can not pass in empty values in jvmargs so if not testBundle
specified, we'll pass a junk (unused) value
@@ -446,7 +447,7 @@
<target name="init">
- <echo message="dropinsFolder: ${dropinsFolder} "/>
+ <echo level="debug" message="dropinsFolder: ${dropinsFolder} "/>
<condition
property="install.destination"
value="${testRoot}${dropinsFolder}/"
diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index aa49836ca..d185510b8 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -59,6 +59,7 @@
<!-- if results already exist, delete them -->
<delete
+ quiet="true"
dir="${testRoot}/results"
failOnError="false"/>
<mkdir dir="${testRoot}/results"/>
diff --git a/releng.wtpbuilder/distribution/wtp4x.build/build.xml b/releng.wtpbuilder/distribution/wtp4x.build/build.xml
index b38e35d89..88d2ae032 100644
--- a/releng.wtpbuilder/distribution/wtp4x.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.build/build.xml
@@ -36,7 +36,7 @@
<echo
- level="info"
+ level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
<ant antfile="${buildTargets}">
<property
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/build.xml b/releng.wtpbuilder/distribution/wtp4x.site/build.xml
index d00193e14..6ce732d2d 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.site/build.xml
@@ -18,7 +18,7 @@
<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">
<!-- make sure there is a base builder, since we need the launcher -->
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/publish.xml b/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
index 461abf0c0..fc3f0741f 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
@@ -53,7 +53,7 @@
<fail
message="dependency file not found: ${dependency.properties}"
unless="dependency.properties.exists"/>
- <echo message="dependency file: ${dependency.properties}"/>
+ <echo level="debug" message="dependency file: ${dependency.properties}"/>
<target name="default">
<copy todir="${resultDir}">
@@ -283,7 +283,7 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
- <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
+ <echo level="debug" message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</target>
<target name="replaceData">
diff --git a/releng.wtpbuilder/distribution/wtp4x.tests/build.xml b/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
index 0b4228082..3227847fc 100644
--- a/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
@@ -17,7 +17,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
- level="info"
+ level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property file="${keyCfgFile}"/>
<!--
@@ -59,6 +59,7 @@
<!-- if results already exist, delete them -->
<delete
+ quiet="true"
dir="${testRoot}/results"
failOnError="false"/>
<mkdir dir="${testRoot}/results"/>
@@ -68,7 +69,7 @@
overwrite="true">
<fileset dir="${test.component.dir}/testScripts"/>
</copy>
- <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
+ <echo level="debug" message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
<property
name="dependency.properties"
@@ -88,7 +89,7 @@
<fail
message="test dependency file not found: ${test.dependency}"
unless="test.dependency.exists"/>
- <echo message="test.dependency file: ${test.dependency}"/>
+ <echo level="debug" message="test.dependency file: ${test.dependency}"/>
<ant
antfile="${test.dependency}"
target="get">
@@ -222,7 +223,7 @@
</java>
<!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy,
just in case we need it -->
- <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
+ <echo level="debug" message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
<condition property="p2DirectorInstallFailed">
<not>
@@ -291,7 +292,7 @@
<property
name="eclipse.home"
value="${testRoot}"/>
- <echo message="testTarget: ${testTarget}"/>
+ <echo level="debug" message="testTarget: ${testTarget}"/>
<!--
can not pass in empty values in jvmargs so if not testBundle
specified, we'll pass a junk (unused) value
@@ -446,7 +447,7 @@
<target name="init">
- <echo message="dropinsFolder: ${dropinsFolder} "/>
+ <echo level="debug" message="dropinsFolder: ${dropinsFolder} "/>
<condition
property="install.destination"
value="${testRoot}${dropinsFolder}/"
diff --git a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
index 977a8a164..aa2fe8ea3 100644
--- a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
@@ -37,7 +37,7 @@
<echo
- level="info"
+ level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
index fa933f667..e6024f8ae 100644
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
@@ -21,7 +21,7 @@
<!-- calling label.xml to createg label.properties file -->
<ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
<echo
- level="info"
+ level="debug"
message="invoking buildTargets: ${buildTargets} to build for each component"/>
<ant antfile="${buildTargets}">
<property
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/build.xml b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
index dfdb2e988..f79ba99b8 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
@@ -18,7 +18,7 @@
<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}"/>
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
index 461abf0c0..b9d78aa92 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
@@ -53,7 +53,7 @@
<fail
message="dependency file not found: ${dependency.properties}"
unless="dependency.properties.exists"/>
- <echo message="dependency file: ${dependency.properties}"/>
+ <echo level="debug" message="dependency file: ${dependency.properties}"/>
<target name="default">
<copy todir="${resultDir}">
@@ -283,7 +283,7 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
- <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
+ <echo level="debug" message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</target>
<target name="replaceData">
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-320.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-320.xml
index 29f8a3084..4e8a858da 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-320.xml
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-320.xml
@@ -11,7 +11,7 @@
repositoryPath="file:/${repoDirLocation}"/>
<!-- clean up some unnecessary files -->
- <delete failonerror="false">
+ <delete failonerror="false" quiet="true">
<fileset
dir="${repoDirLocation}"
includes="artifacts.jar.pack.gz, content.jar.pack.gz, site.xml"/>
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-321.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-321.xml
index c38864e09..222a0765b 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-321.xml
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-321.xml
@@ -11,7 +11,7 @@
repositoryPath="file:/${repoDirLocation}"/>
<!-- clean up some unnecessary files -->
- <delete failonerror="false">
+ <delete failonerror="false" quiet="true">
<fileset
dir="${repoDirLocation}"
includes="artifacts.jar.pack.gz, content.jar.pack.gz, site.xml"/>
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml
index 2b5d5ea71..7f3b11a97 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-322.xml
@@ -11,7 +11,7 @@
repositoryPath="file:/${repoDirLocation}"/>
<!-- clean up some unnecessary files -->
- <delete failonerror="false">
+ <delete failonerror="false" quiet="true">
<fileset
dir="${repoDirLocation}"
includes="artifacts.jar.pack.gz, content.jar.pack.gz, site.xml"/>
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-330.xml b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-330.xml
index 8aad5569b..419feb23f 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-330.xml
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/process-artifacts-330.xml
@@ -11,7 +11,7 @@
repositoryPath="file:/${repoDirLocation}"/>
<!-- clean up some unnecessary files -->
- <delete failonerror="false">
+ <delete failonerror="false" quiet="true">
<fileset
dir="${repoDirLocation}"
includes="artifacts.jar.pack.gz, content.jar.pack.gz, site.xml"/>
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/testHeliosMirror.xml b/releng.wtpbuilder/manualStepScripts/antrunner/testHeliosMirror.xml
index 1a5cd220a..ceff08266 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/testHeliosMirror.xml
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/testHeliosMirror.xml
@@ -12,7 +12,7 @@
name="repoToMirror"
value="/home/data/httpd/download.eclipse.org/releases/maintenance"/>
<target name="p2Mirror">
- <delete
+ <delete quiet="true"
dir="${todir}"
failonerror="false"/>
<mkdir dir="${todir}"/>
diff --git a/releng.wtpbuilder/manualStepScripts/antrunner/testMirror.xml b/releng.wtpbuilder/manualStepScripts/antrunner/testMirror.xml
index 42f7bd872..845bdda92 100644
--- a/releng.wtpbuilder/manualStepScripts/antrunner/testMirror.xml
+++ b/releng.wtpbuilder/manualStepScripts/antrunner/testMirror.xml
@@ -16,7 +16,7 @@
value="/home/data/httpd/download.eclipse.org/webtools/downloads/drops/R3.2.2/M-3.2.2-20100910064233/repository/"/>
<target name="p2Mirror">
- <delete failonerror="false">
+ <delete quiet="true" failonerror="false">
<dirset dir="${todir}"/>
</delete>
<mkdir dir="${todir}"/>
diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index ee8561050..41982820a 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -78,7 +78,7 @@
p2.build.repo, but update content and artifacts files remove
temp file
-->
- <echo message="p2.build.repo: ${p2.build.repo}"/>
+ <echo level="debug" message="p2.build.repo: ${p2.build.repo}"/>
<zip destfile="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip">
<zipfileset
dir="${buildDirectory}/${buildLabel}/buildrepository/${component}/"
@@ -91,7 +91,7 @@
comment out the following delete statement, when debugging,
to see original zip files, before updatePackProperties ran
-->
- <delete file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip.bak"/>
+ <delete quiet="true" file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip.bak"/>
<!--
==================================================================================
sign the jars in archive file
@@ -121,7 +121,7 @@
remove our temp zip file. Can comment out the delete
statement, when testing or debugging.
-->
- <delete file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
+ <delete quiet="true" file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
</target>
<target
name="finishPackages"
@@ -246,11 +246,11 @@
</condition>
<!-- echo important values, so it's documneted in build logs -->
- <echo message="doPack: ${doPack}"/>
- <echo message="packJarFiles: ${packJarFiles}"/>
- <echo message="normalizeJarFiles: ${normalizeJarFiles}"/>
- <echo message="doSign: ${doSign}"/>
- <echo message="doNormalize: ${doNormalize}"/>
+ <echo level="debug" message="doPack: ${doPack}"/>
+ <echo level="debug" message="packJarFiles: ${packJarFiles}"/>
+ <echo level="debug" message="normalizeJarFiles: ${normalizeJarFiles}"/>
+ <echo level="debug" message="doSign: ${doSign}"/>
+ <echo level="debug" message="doNormalize: ${doNormalize}"/>
</target>
<!--
@@ -290,9 +290,9 @@
algorithm="SHA1"/>
</target>
<target name="check.sign">
- <echo message="sign: ${sign}"/>
- <echo message="env skip jar signing: ${env.SKIP_JAR_SIGNING}"/>
- <echo message="skip jar signing: ${SKIP_JAR_SIGNING}"/>
+ <echo level="debug" message="sign: ${sign}"/>
+ <echo level="debug" message="env skip jar signing: ${env.SKIP_JAR_SIGNING}"/>
+ <echo level="debug" message="skip jar signing: ${SKIP_JAR_SIGNING}"/>
<condition property="doSign">
<and>
<equals
@@ -316,7 +316,7 @@
</not>
</and>
</condition>
- <echo message="doSign: ${doSign}"/>
+ <echo level="debug" message="doSign: ${doSign}"/>
</target>
<target
name="createTraditionalZipFiles"
@@ -353,7 +353,7 @@
value="${ziparchiveName}"/>
</antcall>
- <delete dir="${temprunnabledir}"/>
+ <delete quiet="true" dir="${temprunnabledir}"/>
</target>
<target name="nodefault">
diff --git a/releng.wtpbuilder/scripts/build/checkForFastFail.xml b/releng.wtpbuilder/scripts/build/checkForFastFail.xml
index 466447188..06942bccd 100644
--- a/releng.wtpbuilder/scripts/build/checkForFastFail.xml
+++ b/releng.wtpbuilder/scripts/build/checkForFastFail.xml
@@ -13,7 +13,6 @@
name="resource"
value="/opt/public/webtools/committers/wtp-R3.3.0-I/20110308135648/I-3.3.0-20110308135648/antBuilderOutput.log"/>
-->
- <echo message="log file to check for failures: ${resource}"/>
<!-- remember to quote any grep special characters, such as bracket ([) -->
<antcall target="checkForString">
@@ -71,7 +70,7 @@
errorproperty="ignoredErrored"
error="/dev/null"
failonerror="false">
- <arg line="-s --max-count 1 --after-context 10 --before-context 10 --regexp='${stringToCheck}' ${resource}"/>
+ <arg line="-s --max-count 1 --after-context 20 --before-context 10 --regexp='${stringToCheck}' ${resource}"/>
</exec>
<!-- it appears the exec, at least for grep, returns an empty string if no match
@@ -95,13 +94,13 @@
<property
name="formatedReasonFailedText"
- value="FAST FAIL CHECK found matching string '${stringToCheck}'${line.separator}----------------${line.separator}Context of matching text leading to fast fail: ${line.separator}----------------${line.separator}${reasonFailedText}${line.separator}----------------${line.separator}"/>
+ value="FAST FAIL CHECK found matching string '${stringToCheck}'${line.separator}----------------${line.separator}Context of matching text leading to fast fail (-10 to +20 lines, see ${resource} if reason not obvious from context): ${line.separator}----------------${line.separator}${reasonFailedText}${line.separator}----------------${line.separator}"/>
<!-- be sure to echo reason msg to log -->
<!-- TODO: we could write this to a file, and make available from download page -->
<echo message="FAST FAIL CHECK found reason to end build: ${shortDescription}"/>
-
+ <echo message="Resource being used in fast fail check: ${resource}"/>
<echo message="${formatedReasonFailedText}"/>
<!-- copy early, if we can ... else site won't be created, when we fail -->
diff --git a/releng.wtpbuilder/scripts/build/customizeAccessRules.xml b/releng.wtpbuilder/scripts/build/customizeAccessRules.xml
index 1ca3ee3ea..8a3fe7d45 100644
--- a/releng.wtpbuilder/scripts/build/customizeAccessRules.xml
+++ b/releng.wtpbuilder/scripts/build/customizeAccessRules.xml
@@ -5,7 +5,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
- level="info"
+ level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property file="${keyCfgFile}"/>
diff --git a/releng.wtpbuilder/scripts/build/label.xml b/releng.wtpbuilder/scripts/build/label.xml
index 2e24c5942..34960913d 100644
--- a/releng.wtpbuilder/scripts/build/label.xml
+++ b/releng.wtpbuilder/scripts/build/label.xml
@@ -72,9 +72,9 @@ fall back on date/time -->
<isset property="cctimestamp"/>
</condition>
- <echo message="cctimestamp: ${cctimestamp}"/>
- <echo message="datetime: ${date}${time} "/>
- <echo message="timestamp: ${timestamp}"/>
+ <echo level="debug" message="cctimestamp: ${cctimestamp}"/>
+ <echo level="debug" message="datetime: ${date}${time} "/>
+ <echo level="debug" message="timestamp: ${timestamp}"/>
<!-- build type should always be set by caller, but in case not, such as for local testing of script, we'll set to 'U' for "unknown" -->
<property
diff --git a/releng.wtpbuilder/scripts/build/maptasks.xml b/releng.wtpbuilder/scripts/build/maptasks.xml
index 7d9f725d5..2af95c89c 100644
--- a/releng.wtpbuilder/scripts/build/maptasks.xml
+++ b/releng.wtpbuilder/scripts/build/maptasks.xml
@@ -66,7 +66,7 @@
name="mapCvsRoot"
value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}"/>
<echo
- level="info"
+ level="debug"
message="mapCvsRoot: ${mapCvsRoot}"/>
<!--
fetchAllMaps is pure convenience. If you are tempted to modify
@@ -236,10 +236,10 @@
level="debug"
message="mapCvsRoot: ${mapCvsRoot}"/>
<echo
- level="info"
+ level="debug"
message="cvsPackage = ${cvsPackage} "/>
<echo
- level="info"
+ level="debug"
message="versionTagParam: ${versionTagParam}"/>
<!-- if not set, fail. There are no safe assumptions. -->
@@ -282,7 +282,7 @@
<target
name="rewriteMaps"
if="rewriteMapsLine">
- <echo message="rewriteMapsLine: ${rewriteMapsLine}"/>
+ <echo level="debug" message="rewriteMapsLine: ${rewriteMapsLine}"/>
<!-- we have to check for existence, since in some builds, such as maintenance,
we check out all maps, but not all maps have been branched. -->
<available
@@ -293,7 +293,7 @@
<target
name="unrewriteMaps"
if="unrewriteMapsLine">
- <echo message="unrewriteMapsLine: ${unrewriteMapsLine}"/>
+ <echo level="debug" message="unrewriteMapsLine: ${unrewriteMapsLine}"/>
<!-- we have to check for existence, since in some builds, such as maintenance,
we check out all maps, but not all maps have been branched. -->
<!-- <available
@@ -304,7 +304,7 @@
<target
name="rewriteMapsHttp"
if="rewriteHttpLines">
- <echo message="rewriteHttpLines: ${rewriteHttpLines}"/>
+ <echo level="debug" message="rewriteHttpLines: ${rewriteHttpLines}"/>
<!-- we have to check for existence, since in some builds, such as maintenance,
we check out all maps, but not all maps have been branched. -->
<available
@@ -364,14 +364,16 @@
arg2="false"/>
</condition>
<echo
- level="info"
+ level="debug"
message="tagMaps: ${tagMaps}"/>
</target>
<target name="checkLocal">
<condition property="mapsLocal">
<available file="${buildDirectory}/maps/${cvsPackage}"/>
</condition>
- <echo message="mapsLocal: ${mapsLocal}"/>
+ <echo
+ level="debug"
+ message="mapsLocal: ${mapsLocal}"/>
</target>
<!--
Default target
diff --git a/releng.wtpbuilder/scripts/build/runAntRunner.xml b/releng.wtpbuilder/scripts/build/runAntRunner.xml
index 682bf2583..5ef73b02c 100644
--- a/releng.wtpbuilder/scripts/build/runAntRunner.xml
+++ b/releng.wtpbuilder/scripts/build/runAntRunner.xml
@@ -31,7 +31,7 @@
unless="env.BUILD_HOME"
message="all scripts need a BUILD_HOME"/>
<echo
- level="info"
+ level="debug"
message="buildDirectory: ${buildDirectory}"/>
<property
name="keyCfgFile"
diff --git a/releng.wtpbuilder/scripts/build/runAppRunner.xml b/releng.wtpbuilder/scripts/build/runAppRunner.xml
index 633bbc57f..b3561ebd9 100644
--- a/releng.wtpbuilder/scripts/build/runAppRunner.xml
+++ b/releng.wtpbuilder/scripts/build/runAppRunner.xml
@@ -28,7 +28,7 @@
unless="env.BUILD_HOME"
message="all scripts need a BUILD_HOME"/>
<echo
- level="info"
+ level="debug"
message="buildDirectory: ${buildDirectory}"/>
<property
name="keyCfgFile"
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index 86cec10d1..881250740 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -74,7 +74,7 @@
${eclipse.pdebuild.templates} points to the templates folder. You can use this
instead of the more error prone manual "pde.build.scripts"
-->
- <echo message="eclipse.pdebuild.scripts: ${eclipse.pdebuild.scripts}"/>
+ <echo level="debug" message="eclipse.pdebuild.scripts: ${eclipse.pdebuild.scripts}"/>
<ant
antfile="build.xml"
@@ -130,7 +130,7 @@
<fail if="p2DirectorInstallFailed"/>
- <echo message="installed eclipse builder: ${pde.builder.path}"/>
+ <echo level="debug" message="installed eclipse builder: ${pde.builder.path}"/>
</target>
@@ -139,7 +139,7 @@
depends="init,checkBaseBuilder"
if="basebuilderlocal">
- <echo message="found installed eclipse builder: ${pde.builder.path}"/>
+ <echo level="debug" message="found installed eclipse builder: ${pde.builder.path}"/>
</target>
@@ -239,7 +239,7 @@
</java>
<!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy,
just in case we need it -->
- <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
+ <echo level="debug" message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
<condition property="p2DirectorInstallFailed">
<not>
@@ -289,7 +289,7 @@
message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
<echo
- level="info"
+ level="debug"
message="buildDirectory: ${buildDirectory}"/>
<!--
@@ -399,9 +399,9 @@
we convert them to system (environment) properties, which is
where PDE expects to find them
-->
- <echo message="JavaSE-1.6=${JavaSE-1.6}"/>
- <echo message="J2SE-1.5=${J2SE-1.5}"/>
- <echo message="J2SE-1.4=${J2SE-1.4}"/>
+ <echo level="debug" message="JavaSE-1.6=${JavaSE-1.6}"/>
+ <echo level="debug" message="J2SE-1.5=${J2SE-1.5}"/>
+ <echo level="debug" message="J2SE-1.4=${J2SE-1.4}"/>
<!--
<mkdir dir="${buildDirectory}/${buildLabel}"/>
<mkdir dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
diff --git a/releng.wtpbuilder/scripts/build/signjars.xml b/releng.wtpbuilder/scripts/build/signjars.xml
index 32ff4b86c..c74c01b85 100644
--- a/releng.wtpbuilder/scripts/build/signjars.xml
+++ b/releng.wtpbuilder/scripts/build/signjars.xml
@@ -82,7 +82,7 @@
<!--copy zip file to staging directory-->
<!-- but first make positive that staging area is completely clean, incase used before. In future, might want to fail if it's not? -->
- <echo message="deleting any possible files in staging area "/>
+ <echo level="debug" message="deleting any possible files in staging area "/>
<!-- this first output creates or replaces signingHistory file, all subsequent ones should append -->
<exec
executable="ssh"
@@ -159,7 +159,7 @@
</exec>
<!--delete files on build.eclipse.org-->
- <echo message="delete temp files on build.eclipse.org"/>
+ <echo level="debug" message="delete temp files on build.eclipse.org"/>
<exec
executable="ssh"
output="${signingHistory}"
@@ -167,7 +167,7 @@
<arg line="${sshUser} /bin/rm -rf ${outputFile}"/>
</exec>
- <echo message="delete signing directory we created on build.eclipse.org"/>
+ <echo level="debug" message="delete signing directory we created on build.eclipse.org"/>
<exec
executable="ssh"
output="${signingHistory}"
@@ -193,7 +193,7 @@
-->
<target name="compareAttributes">
<!--poll file for change in attributes-->
- <echo message="Polled Number of Files: ${polledNFiles} (pre-poll)"/>
+ <echo level="debug" message="Polled Number of Files: ${polledNFiles} (pre-poll)"/>
<exec
executable="ssh"
outputProperty="polledNFiles">
@@ -201,7 +201,7 @@
</exec>
<echo message="Polled Number of Files: ${polledNFiles} (post-poll)"/>
- <echo message="polled: ${polledAttributes} (pre-poll)"/>
+ <echo level="debug" message="polled: ${polledAttributes} (pre-poll)"/>
<exec
executable="ssh"
outputProperty="polledAttributes">
@@ -283,9 +283,9 @@
set as env variable or ant variable.
-->
<target name="check.sign">
- <echo message="sign: ${sign}"/>
- <echo message="env skip jar signing: ${env.SKIP_JAR_SIGNING}"/>
- <echo message="skip jar signing: ${SKIP_JAR_SIGNING}"/>
+ <echo level="debug" message="sign: ${sign}"/>
+ <echo level="debug" message="env skip jar signing: ${env.SKIP_JAR_SIGNING}"/>
+ <echo level="debug" message="skip jar signing: ${SKIP_JAR_SIGNING}"/>
<condition property="doSign">
<and>
<equals
diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
index f6c3b6c42..fc025f774 100644
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ b/releng.wtpbuilder/scripts/dependency/build.xml
@@ -311,15 +311,6 @@
antfile="${installWorkingDirectory}/dependency.${groupId}.xml"
target="get"/>
- <!--
- <delete failonerror="false">
- <fileset dir=".">
- <include name="${installWorkingDirectory}/dependency.${groupId}.xml" />
- </fileset>
- </delete>
- -->
-
-
</target>
<target name="installDependency">
@@ -400,13 +391,6 @@
value="${install.destination}"/>
</ant>
- <!--
- <delete failonerror="false">
- <fileset dir=".">
- <include name="${installWorkingDirectory}/dependency.${groupId}.xml" />
- </fileset>
- </delete>
- -->
</target>
diff --git a/releng.wtpbuilder/scripts/dependency/dependency.xml b/releng.wtpbuilder/scripts/dependency/dependency.xml
index 36536ca36..c15001efe 100644
--- a/releng.wtpbuilder/scripts/dependency/dependency.xml
+++ b/releng.wtpbuilder/scripts/dependency/dependency.xml
@@ -15,7 +15,7 @@
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
- level="info"
+ level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<fail message="Required property file does not exist: ${keyCfgFile}">
<condition>
@@ -52,16 +52,16 @@
<property file="${tobeinstalled.properties}"/>
- <echo message="pde.builder.path: ${pde.builder.path}"/>
- <echo message="eclipsebuilder.id: ${eclipsebuilder.id}"/>
+ <echo level="debug" message="pde.builder.path: ${pde.builder.path}"/>
+ <echo level="debug" message="eclipsebuilder.id: ${eclipsebuilder.id}"/>
<property
name="dependencyTargets"
value="${wtp.builder.home}/scripts/dependency/build.xml"/>
- <echo message="dependencyTargets: ${dependencyTargets}"/>
- <echo message="base.install.dir: ${base.install.dir}"/>
- <echo message="tobeinstalled.properties: ${tobeinstalled.properties}"/>
- <echo message="installWorkingDirectory: ${installWorkingDirectory}"/>
+ <echo level="debug" message="dependencyTargets: ${dependencyTargets}"/>
+ <echo level="debug" message="base.install.dir: ${base.install.dir}"/>
+ <echo level="debug" message="tobeinstalled.properties: ${tobeinstalled.properties}"/>
+ <echo level="debug" message="installWorkingDirectory: ${installWorkingDirectory}"/>
<antcall target="prereq.eclipse"/>
<antcall target="prereq.e4x"/>
@@ -86,7 +86,7 @@
<!-- Note: this target is called from "install base buider" routines, not "install prereqs" like most targets here -->
<target name="prereq.eclipsebuilder">
- <echo message="eclipse builder installing to: ${eclipse.builder.base.install.dir}"/>
+ <echo message="eclipse builder being installed to: ${eclipse.builder.base.install.dir}"/>
<mkdir dir="${eclipse.builder.base.install.dir}"/>
<antcall target="getAndInstall">
<param
@@ -99,7 +99,7 @@
</target>
<!-- Note: this target is called from "install base buider" routines, not "install prereqs" like most targets here -->
<target name="prereq.wtpbuildtools">
- <echo message="wtp build tools installing to: ${pde.builder.path}"/>
+ <echo level="debug" message="wtp build tools installing to: ${pde.builder.path}"/>
<!-- TODO could check if ${eclipse.builder.base.install.dir} exists, since would be error if not -->
<antcall target="getAndInstallRepo">
@@ -435,7 +435,7 @@
name="install.destination"
value="${base.install.dir}${dropinsFolder}"/>
-->
- <echo message="dropinsFolder: ${dropinsFolder} "/>
+ <echo level="debug" message="dropinsFolder: ${dropinsFolder} "/>
<condition
property="install.destination"
value="${base.install.dir}${dropinsFolder}/${groupId}"
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index 16028788c..208e16fb0 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -160,10 +160,10 @@
depends="init">
<echo
- level="info"
+ level="debug"
message="Getting ${dependency.file} or ${dependency.repo}"/>
<echo
- level="info"
+ level="debug"
message="Url: ${dependency.url}"/>
<ant
@@ -180,16 +180,16 @@
name="install"
depends="init">
<echo
- level="info"
+ level="debug"
message="Installing ${dependency.file}"/>
<echo
- level="info"
+ level="debug"
message="destination: ${install.destination}"/>
<antcall target="cleanInstall"/>
<property file="${installWorkingDirectory}/installmanifest.properties"/>
<antcall target="callInstall"/>
<echo
- level="info"
+ level="debug"
message="installmanifest.properties: ${installWorkingDirectory}/installmanifest.properties"/>
<echo
file="${installWorkingDirectory}/installmanifest.properties"
@@ -206,10 +206,10 @@
name="installRepo"
depends="init">
<echo
- level="info"
+ level="debug"
message="Installing ${dependency.repo}"/>
<echo
- level="info"
+ level="debug"
message="destination: ${install.destination}"/>
<antcall target="cleanInstall"/>
<property file="${installWorkingDirectory}/installmanifest.properties"/>
@@ -223,14 +223,21 @@
prereq can not be unzipped for some reason. See
https://bugs.eclipse.org/bugs/show_bug.cgi?id=283968
-->
- <echo message="install repo for groupId: ${groupId}"/>
+
<property
name="tobeinstalledrepo"
value="${installWorkingDirectory}/temprepos/${groupId}"/>
- <echo message="tobeinstalledrepo: ${tobeinstalledrepo}"/>
- <echo message="tobeInstalledfeaturegroups: ${dependency.tobeinstalledfeaturegroups}"/>
+ <echo
+ level="debug"
+ message="install repo for groupId: ${groupId}"/>
+ <echo
+ level="debug"
+ message="tobeinstalledrepo: ${tobeinstalledrepo}"/>
+ <echo
+ level="debug"
+ message="tobeInstalledfeaturegroups: ${dependency.tobeinstalledfeaturegroups}"/>
- <delete failonerror="false">
+ <delete failonerror="false" quiet="true">
<dirset dir="${tobeinstalledrepo}"/>
</delete>
<mkdir dir="${tobeinstalledrepo}"/>
@@ -258,7 +265,7 @@
</classpath>
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
<arg value="-nosplash"/>
- <arg value="-debug"/>
+ <!-- <arg value="-debug"/> -->
<arg value="-consolelog"/>
<arg value="-data"/>
<arg value="${installWorkingDirectory}/p2DirectorInstall"/>
@@ -283,7 +290,9 @@
<arg value="-vmArgs"/>
</java>
- <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
+ <echo
+ level="debug"
+ message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml b/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
index ef3cc8010..a720d10cf 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
+++ b/releng.wtpbuilder/scripts/standaloneTest/standalonePerfTest.xml
@@ -71,15 +71,12 @@
name="testRoot"
value="${build.home}/testRoot/"/>
<!-- don't delete automatically
- <delete
+ <delete quiet="true"
dir="${testRoot}"
failonerror="false"/>
-->
<mkdir dir="${testRoot}"/>
- <!-- no longer needed here, ... done in standalonecheckout
- <antcall
- target="getReleng"/>
- -->
+
<condition property="installed">
<available
@@ -209,7 +206,7 @@
<property
name="testRoot"
value="${build.home}/testRoot"/>
- <delete
+ <delete quiet="true"
dir="${testRoot}"
failonerror="false"/>
</target>
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml b/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
index b2f3f7e75..e6d8aec70 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
+++ b/releng.wtpbuilder/scripts/standaloneTest/standaloneTest.xml
@@ -150,7 +150,7 @@
<property
name="testRoot"
value="${build.home}/testRoot"/>
- <delete
+ <delete quiet="true"
dir="${testRoot}"
failonerror="false"/>
</target>
diff --git a/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml b/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml
index 702fb29ba..c5cb41b2b 100644
--- a/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml
+++ b/releng.wtpbuilder/scripts/standaloneTest/standalonecheckout.xml
@@ -86,7 +86,7 @@
deleting WTP builder project location: <BUILD
HOME>/projectBuilders/<project>/webtools.releng/releng.wtpbuilder
-->
- <delete
+ <delete quiet="true"
dir="${codir}/${env.RELENG_BUILDER}"
failonerror="true"/>
<!--
@@ -127,7 +127,7 @@
if="doClean">
<echo message="Version tag for ${env.RELENG}: ${mapVersionTag}"/>
- <delete
+ <delete quiet="true"
dir="${codir}/${env.RELENG}"
failonerror="true"/>
<cvs
--
GitLab