diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index a8172c13796b2e939819841885be953e3b0b5e48..aa2925044b071a9d1a174f53d1eee990acc97261 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -120,7 +120,13 @@
tag="HEAD" />
</target>
-
+ <target name="wst-R2.0-I">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng"
+ dest="${codir}"
+ tag="HEAD" />
+ </target>
<!--
The order of execution of these three worker targets
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index f13f840a306c307122887bed032fa7661cfa0340..2cf422717888c367ed0d8417e289b73c0487e5f9 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -21,7 +21,13 @@
<param name="base.install.dir"
value="${buildDirectory}/maps/releng/maps/" />
</antcall>
-
+
+ <mkdir dir="${pde.builder.path}/plugins/" />
+ <antcall target="getAndInstall">
+ <param name="groupId" value="wtpBuildTools" />
+ <param name="base.install.dir"
+ value="${pde.builder.path}/plugins/" />
+ </antcall>
diff --git a/releng.wtpbuilder/components/wtp-buildTools/build.properties b/releng.wtpbuilder/components/wtp-buildTools/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..3d63de8701efc27f741a7edc692bbd9cacaf3676
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-buildTools/build.properties
@@ -0,0 +1,36 @@
+###############################################################################
+# Copyright (c) 2003, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+# The CVS tag to use when fetching the map files from the repository
+mapVersionTag=HEAD
+runPackager=true
+
+# This is a subdirectory of $buildDirectory
+# Set collectingFolder and archivePrefix to . if you want to create archives without
+# trailing eclipse in the paths of the included files
+collectingFolder=eclipse
+
+# The prefix that will be used in the generated archive.
+# Does not make sense to use a different archivePrefix than collectingFolder,
+# because zip wouldn't find any files to include into the target zip otherwise
+archivePrefix=eclipse
+
+# Whether or not to include debug info in the output jars
+javacDebugInfo=false
+
+# Whether or not to fail the build if there are compiler errors
+javacFailOnError=true
+
+##################################################
+# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
+# using the JDT Compiler Adapter to compile.
+javacVerbose=true
+
diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66ff332169c58d7eecd203d487460878eafb10a9
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
@@ -0,0 +1,257 @@
+<project
+ name="Build specific targets and properties"
+ default="noDefault">
+
+ <!-- ===================================================================== -->
+ <!-- Run a given ${target} on all elements being built -->
+ <!-- Add on <ant> task for each top level element being built. -->
+ <!-- ===================================================================== -->
+ <target name="allElements">
+ <echo message="Target:${target} " />
+ <echo message="basedir: ${basedir}" />
+ <echo message="buildDirectory: ${buildDirectory}" />
+ <echo message="baseLocation: ${baseLocation}" />
+ <ant
+ antfile="${genericTargets}"
+ target="${target}">
+ <property
+ name="type"
+ value="feature" />
+ <property
+ name="id"
+ value="org.eclipse.wtp.releng.tests.feature" />
+ </ant>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Targets to assemble the built elements for particular configurations -->
+ <!-- These generally call the generated assemble scripts (named in -->
+ <!-- ${assembleScriptName}) but may also add pre and post processing -->
+ <!-- Add one target for each root element and each configuration -->
+ <!-- ===================================================================== -->
+
+ <target name="assemble.org.eclipse.wtp.releng.tests.feature">
+ <property
+ name="archiveName"
+ value="wtp-buildTools-${buildLabel}.zip" />
+ <ant
+ antfile="${assembleScriptName}"
+ dir="${buildDirectory}" />
+
+ </target>
+
+ <target name="prePackage" />
+
+ <target name="postPackage">
+ <property
+ name="archiveName"
+ value="wtp-buildTools-${buildLabel}.zip" />
+
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
+ target="unpackUpdateJarsAndCreateZippedPackages">
+ <property
+ name="buildDirectory"
+ value="${buildDirectory}" />
+ <property
+ name="buildLabel"
+ value="${buildLabel}" />
+ <property
+ name="archiveName"
+ value="${archiveName}" />
+ </ant>
+
+
+ </target>
+
+
+
+ <!-- ===================================================================== -->
+ <!-- Check out map files from correct repository -->
+ <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+ <!-- ===================================================================== -->
+ <target name="checkLocal">
+ <available
+ property="mapsLocal"
+ file="${buildDirectory}/maps/releng" />
+ </target>
+ <target
+ name="getMapFiles"
+ depends="checkLocal"
+ unless="mapsLocal">
+
+ <!-- *** change the repo info -->
+ <property
+ name="mapCvsRoot"
+ value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <echo message="${mapCvsRoot} ${mapVersionTag} " />
+ <cvs
+ cvsRoot="${mapCvsRoot}"
+ package="releng"
+ dest="${buildDirectory}/maps"
+ tag="${mapVersionTag}" />
+ <!--tag the map files project-->
+ <antcall target="tagMapFiles">
+ <param
+ name="mapCvsRoot"
+ value="${mapCvsRoot}" />
+ </antcall>
+ </target>
+
+ <target
+ name="tagMapFiles"
+ if="tagMaps">
+ <cvs
+ cvsRoot="${mapCvsRoot}"
+ dest="${buildDirectory}/maps"
+ command="tag v${buildType}${timestamp}" />
+ </target>
+
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before setup -->
+ <!-- ===================================================================== -->
+ <target name="preSetup"></target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after setup but before starting the build proper -->
+ <!-- ===================================================================== -->
+ <target name="postSetup">
+ <dirname
+ file="${ant.file}"
+ property="component.dir" />
+ <ant
+ antfile="${component.dir}/dependency.xml"
+ target="get">
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <property
+ name="base.install.dir"
+ value="${buildRoot}" />
+ </ant>
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before fetching the build elements -->
+ <!-- ===================================================================== -->
+ <target name="preFetch"></target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after fetching the build elements -->
+ <!-- ===================================================================== -->
+ <target name="postFetch"></target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before generating the build scripts. -->
+ <!-- ===================================================================== -->
+ <target name="preGenerate"></target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after generating the build scripts. -->
+ <!-- ===================================================================== -->
+ <target name="postGenerate"></target>
+
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running the build.xmls for the elements being built. -->
+ <!-- ===================================================================== -->
+ <target name="preProcess">
+ <replace
+ dir="${buildDirectory}/plugins"
+ value="${timestamp}"
+ token="@build@">
+ <include name="**/about.mappings" />
+ </replace>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running the build.xmls for the elements being built. -->
+ <!-- ===================================================================== -->
+ <target name="postProcess">
+ <condition property="logsAvailable">
+ <istrue value="${javacVerbose}" />
+ </condition>
+ <antcall target="gatherLogs" />
+ </target>
+
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do before running assemble. -->
+ <!-- ===================================================================== -->
+ <target name="preAssemble">
+
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Steps to do after running assemble. -->
+ <!-- ===================================================================== -->
+ <target name="postAssemble"></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">
+ <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="gatherLogs" />
+ </antcall>
+
+ <unzip
+ dest="${buildDirectory}/${buildLabel}/compilelogs"
+ overwrite="true">
+ <fileset dir="${buildDirectory}/features/org.eclipse.wtp.releng.tests.feature">
+ <include name="**/*.log.zip" />
+ </fileset>
+ </unzip>
+
+
+ </target>
+
+ <target
+ name="clean"
+ unless="noclean">
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="cleanElement" />
+ </antcall>
+ </target>
+
+ <!-- ===================================================================== -->
+ <!-- Default target -->
+ <!-- ===================================================================== -->
+ <target name="noDefault">
+ <echo message="You must specify a target when invoking this file" />
+ </target>
+
+</project>
diff --git a/releng.wtpbuilder/components/wtp-buildTools/dependency.xml b/releng.wtpbuilder/components/wtp-buildTools/dependency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa72280c2b7460ba0f7aba4a4df8c016f663158a
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-buildTools/dependency.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!-- ======================================================================
+ Properties that must be passed to this script:
+ base.install.dir
+ dependencyTargets
+ local.cache.dir
+ dependency.properties
+
+
+ ====================================================================== -->
+<project name="test" default="get">
+
+ <target name="get">
+ <antcall target="getAndInstall">
+ <param name="groupId" value="eclipse" />
+ </antcall>
+ </target>
+
+
+ <target name="getAndInstall">
+ <ant antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property name="groupId" value="${groupId}" />
+ </ant>
+ <ant antfile="${dependencyTargets}"
+ target="installDependency">
+ <property name="groupId" value="${groupId}" />
+ <property name="install.destination"
+ value="${base.install.dir}" />
+ </ant>
+ </target>
+
+
+
+
+</project>
+
diff --git a/releng.wtpbuilder/distribution/wtp-buildTools.build/build.xml b/releng.wtpbuilder/distribution/wtp-buildTools.build/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..337d779b1704b916c9ca48ac3c3bc02a2f3bb50a
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp-buildTools.build/build.xml
@@ -0,0 +1,36 @@
+<project default="build" basedir=".">
+
+
+
+ <target name="build" depends="getBaseBuilder">
+ <dirname file="${ant.file}"
+ property="distribution.wtp.build.dir" />
+ <property file="${wtp.builder.home}/build.properties" />
+ <property name="buildTargets"
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
+
+
+ <ant antfile="${buildTargets}">
+ <property name="component"
+ value="wtp-buildTools" />
+ </ant>
+
+
+ <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+
+
+ </target>
+
+ <target name="getBaseBuilder"
+ if="eclipse.builder.fetch">
+ <dirname file="${ant.file}"
+ property="wtbuilder.dir" />
+ <property name="buildTargets"
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
+ <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
+ <ant antfile="${buildTargets}"
+ target="getBaseBuilder" />
+ </target>
+
+
+</project>
diff --git a/releng.wtpbuilder/distribution/wtp-buildTools.upload/build.xml b/releng.wtpbuilder/distribution/wtp-buildTools.upload/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6fa53fc6227be61a2a70cfbed8b75418db684c1e
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp-buildTools.upload/build.xml
@@ -0,0 +1,12 @@
+<project default="sync" basedir=".">
+
+
+ <target name="sync">
+
+ <ant antfile="${wtp.builder.home}/scripts/upload/upload.xml">
+ <property name="site-sub-dir"
+ value="wtpBuildTools" />
+ </ant>
+
+ </target>
+</project>
diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
index 7229174675b98b695a96be4fbb17b57148bc5cfe..b5716344c3a1782234be5191864393284048fbe5 100644
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ b/releng.wtpbuilder/scripts/dependency/build.xml
@@ -137,6 +137,13 @@
</selector>
</isfileselected>
</condition>
+ <condition property="file.type" value="jar">
+ <isfileselected file="${dependency.file}">
+ <selector>
+ <filename name="**/*.jar" />
+ </selector>
+ </isfileselected>
+ </condition>
<antcall target="install-${file.type}" />
</target>
@@ -162,6 +169,11 @@
file="${local.cache.dir}/${dependency.file}"
overwrite="true" />
</target>
+ <target name="install-jar">
+ <copy todir="${install.destination}"
+ file="${local.cache.dir}/${dependency.file}"
+ overwrite="true" />
+ </target>
<target name="checkDependency">
<dirname file="${ant.file}"