diff --git a/releng/org.eclipse.cdt.releng/.cvsignore b/releng/org.eclipse.cdt.releng/.cvsignore
deleted file mode 100644
index ba2a8cd0dff..00000000000
--- a/releng/org.eclipse.cdt.releng/.cvsignore
+++ /dev/null
@@ -1,14 +0,0 @@
-build
-features
-jars
-logs
-plugins
-test
-zips
-build.log
-build.number
-index.html
-main.xml
-site.xml
-dist
-host
diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index b1120d40838..0e5b70f6e07 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -1 +1,13 @@
-java -classpath $JAVA_HOME/lib/tools.jar:jars/ant.jar:jars/optional.jar:jars/xalan.jar:jars/xml-apis.jar:jars/xercesImpl.jar:jars/NetComponents.jar:jars/activation.jar:jars/mail.jar org.apache.tools.ant.Main $* 2>&1 | tee build.log
+# Treat this is an example build script
+# Please adjust paths as necessary for your build machine
+
+export JAVA_HOME=/opt/java/j2sdk1.4.2_03
+export PATH=$JAVA_HOME/bin:$PATH
+
+cd `dirname $0`
+
+rm -fr results
+
+java -cp eclipse/startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $* \
+ -DbaseLocation=$PWD/eclipse \
+ -DbuildDirectory=$PWD/results
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index e6b86a9b455..6da7ec7a885 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -1,36 +1,184 @@
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.releng/builders/build.properties b/releng/org.eclipse.cdt.releng/builders/build.properties
new file mode 100644
index 00000000000..aa12a1152a4
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/builders/build.properties
@@ -0,0 +1,81 @@
+#####################
+# Parameters describing how and where to execute the build.
+# Typical users need only update the following properties:
+# baseLocation - where things you are building against are installed
+# bootclasspath - The base jars to compile against (typicaly rt.jar)
+# configs - the list of {os, ws, arch} configurations to build.
+#
+# Of course any of the settings here can be overridden by spec'ing
+# them on the command line (e.g., -DbaseLocation=d:/eclipse
+
+############# CVS CONTROL ################
+# The CVS tag to use when fetching the map files from the repository
+mapVersionTag=HEAD
+
+# The CVS tag to use when fetching elements to build. By default the
+# builder will use whatever is in the maps. Use this value to override
+# for example, when doing a nightly build out of HEAD
+# fetchTag=HEAD
+
+
+############## BUILD / GENERATION CONTROL ################
+# The directory into which the build elements will be fetched and where
+# the build will take place. buildDirectory and install should be the same
+# value.
+buildDirectory=build
+
+# Type of build. Used in naming the build output. Typically this value is
+# one of I, N, M, S, ...
+buildType=I
+
+# ID of the build. Used in naming the build output.
+buildId=TestBuild
+
+# Label for the build. Used in naming the build output
+buildLabel=${buildType}.${buildId}
+
+# Timestamp for the build. Used in naming the build output
+timestamp=007
+
+# Base location for anything the build needs to compile against. For example,
+# when building GEF, the baseLocation should be the location of a previously
+# installed Eclipse against which the GEF code will be compiled.
+baseLocation=
+
+#Os/Ws/Arch/nl of the eclipse specified by baseLocation
+#baseos
+#basews
+#basearch
+#basenl
+
+# The location underwhich all of the build output will be collected. This will be
+# the root path in the resultant zip file.
+collPlace=eclipse
+
+# The directory in which to execute zip of the ${collPlace} directory
+collBase=.
+
+# The list of {os, ws, arch} configurations to build. This
+# value is a '&' separated list of ',' separate triples. For example,
+# configs=win32,win32,x86 & linux,motif,x86
+# By default the value is *,*,*
+configs=*,*,*
+
+#Arguments to send to the zip executable
+zipargs=
+
+############# JAVA COMPILER OPTIONS ##############
+# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
+#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
+
+# 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
+
+# The version of the source code
+#javaSource=1.3
+
+# The version of the byte code targeted
+#javacTarget=1.1
diff --git a/releng/org.eclipse.cdt.releng/builders/customTargets.xml b/releng/org.eclipse.cdt.releng/builders/customTargets.xml
new file mode 100644
index 00000000000..a93e269461b
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/builders/customTargets.xml
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.releng/genscripts.xsl b/releng/org.eclipse.cdt.releng/genscripts.xsl
deleted file mode 100644
index 15a187fa88c..00000000000
--- a/releng/org.eclipse.cdt.releng/genscripts.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
- feature@
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.releng/index.xsl b/releng/org.eclipse.cdt.releng/index.xsl
deleted file mode 100644
index 8c4cef49685..00000000000
--- a/releng/org.eclipse.cdt.releng/index.xsl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
- CDT 2.0 Build Page
-
-
- CDT 2.0 Build Page
-
- The nightly builds are currently run twice a week
- Monday and Thursday at 3:00 a.m. EDT/EST.
-
- To get download and install the builds, add the following
- as a site bookmark in Eclipse's Update Manager perspective:
-
-
- http://update.eclipse.org/tools/cdt/updates/builds/2.0
-
-
- There is one category for each build. Expanding the
- category will reveal the installable features.
- Currently the following features are available:
-
- -
- the main CDT feature for the currently running platform
-
- -
- the CDT Source feature which supplies the source to allow
- debugging of the CDT plugins.
-
-
-
- Builds
-
- The reports from the automated build verification test suites
- are linked below.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.releng/junit.xsl b/releng/org.eclipse.cdt.releng/junit.xsl
deleted file mode 100644
index a7dd9abed93..00000000000
--- a/releng/org.eclipse.cdt.releng/junit.xsl
+++ /dev/null
@@ -1,455 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Packages
- Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Failure
- Error
-
-
- |
- |
- |
- |
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Package
-
-
- Back to top
-
-
-
-
-
-
-
-
-
-
- TestCase
-
-
-
-
-
- Back to top
-
-
-
-
- Summary
-
-
-
-
-
-
-
- Tests |
- Failures |
- Errors |
- Success rate |
- Time |
-
-
-
-
- Failure
- Error
-
-
- |
- |
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
-
-
- Note: failures are anticipated and checked for with assertions while errors are unanticipated.
- |
-
-
-
-
-
-
- cur = TestCases['.'] = new Array();
-
-
- cur[''] = '';
-
-
-
-
-
- Unit Test Results
-
-
- |
- Designed for use with JUnit and Ant. |
-
-
-
-
-
-
-
- Name |
- Tests |
- Errors |
- Failures |
- Time(s) |
-
-
-
-
-
-
- Name |
- Tests |
- Errors |
- Failures |
- Time(s) |
-
-
-
-
-
-
- Name |
- Status |
- Type |
- Time(s) |
-
-
-
-
-
-
-
-
-
-
- Failure
- Error
-
-
-
-
- |
- |
- |
- |
-
-
-
-
- |
-
-
-
-
-
-
-
- Error
-
-
- |
-
-
- Failure |
- |
-
-
- Error |
- |
-
-
- Success |
- |
-
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- N/A
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \\
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.releng/main.xsl b/releng/org.eclipse.cdt.releng/main.xsl
deleted file mode 100644
index d6d54fc9330..00000000000
--- a/releng/org.eclipse.cdt.releng/main.xsl
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -feature
-
-
-
-
- build/features/
-
-
-
-
- build/features/
-
- -feature
-
-
-
-
-
-
-
-
-
- build/
-
- s/
-
- /
-
- .xml
-
-
-
-
-
- build/
-
- s/
-
- /
-
- .xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- build/plugins/
-
-
-
-
-
-
-
-
- build/plugins/
-
-
-
-
-
-
-
-
-
-
-
-
-
- build/features/
-
-
-
-
-
-
-
-
-
- build/features/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /
-
- _${build.version}.${build.number}.jar
-
-
-
-
-
-
-
-
-
-
-
-
- /
-
- _${build.version}.${build.number}.jar
-
-
-
-
-
-
-
-
-
-
-
-
- /
-
- _${build.version}.${build.number}.bin.dist.zip
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- s/
-
- _${build.version}.${build.number}.jar
-
-
- test/
-
- s/
-
- _${build.version}.${build.number}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.releng/manifest.xml b/releng/org.eclipse.cdt.releng/manifest.xml
deleted file mode 100644
index 3dc4fa7545b..00000000000
--- a/releng/org.eclipse.cdt.releng/manifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
new file mode 100644
index 00000000000..c0aa6c2076e
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -0,0 +1,38 @@
+! Cross platform
+
+plugin@org.eclipse.cdt.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+plugin@org.eclipse.cdt.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+
+plugin@org.eclipse.cdt.debug.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+plugin@org.eclipse.cdt.debug.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+
+plugin@org.eclipse.cdt.debug.mi.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+plugin@org.eclipse.cdt.debug.mi.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+
+plugin@org.eclipse.cdt.launch=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+
+plugin@org.eclipse.cdt.doc.user=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+
+plugin@org.eclipse.cdt=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+feature@org.eclipse.cdt=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-feature
+
+! Platform specific
+
+fragment@org.eclipse.cdt.core.aix=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+fragment@org.eclipse.cdt.core.linux=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+fragment@org.eclipse.cdt.core.qnx=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+fragment@org.eclipse.cdt.core.solaris=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+fragment@org.eclipse.cdt.core.win32=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+
+! Builders
+
+plugin@org.eclipse.cdt.make.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+plugin@org.eclipse.cdt.make.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+feature@org.eclipse.cdt.make=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.make-feature
+
+plugin@org.eclipse.cdt.managedbuilder.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+plugin@org.eclipse.cdt.managedbuilder.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
+feature@org.eclipse.cdt.managedbuilder=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.managedbuilder-feature
+
+! Source Feature
+
diff --git a/releng/org.eclipse.cdt.releng/message.txt b/releng/org.eclipse.cdt.releng/message.txt
deleted file mode 100644
index 2f53bb3cfc0..00000000000
--- a/releng/org.eclipse.cdt.releng/message.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The build is available at
-
- http://update.eclipse.org/tools/cdt/updates/builds/2.0
-
-Cheers,
-dschaefer2, the buildmaster...
diff --git a/releng/org.eclipse.cdt.releng/platform/build.properties b/releng/org.eclipse.cdt.releng/platform/build.properties
new file mode 100644
index 00000000000..70b9409fff6
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/platform/build.properties
@@ -0,0 +1,87 @@
+#####################
+# Parameters describing how and where to execute the build.
+# Typical users need only update the following properties:
+# baseLocation - where things you are building against are installed
+# bootclasspath - The base jars to compile against (typicaly rt.jar)
+# configs - the list of {os, ws, arch} configurations to build.
+#
+# Of course any of the settings here can be overridden by spec'ing
+# them on the command line (e.g., -DbaseLocation=d:/eclipse
+
+############# CVS CONTROL ################
+# The CVS tag to use when fetching the map files from the repository
+mapVersionTag=HEAD
+
+# The CVS tag to use when fetching elements to build. By default the
+# builder will use whatever is in the maps. Use this value to override
+# for example, when doing a nightly build out of HEAD
+# fetchTag=HEAD
+
+
+############## BUILD / GENERATION CONTROL ################
+# The directory into which the build elements will be fetched and where
+# the build will take place. buildDirectory and install should be the same
+# value.
+buildDirectory=build
+
+# Type of build. Used in naming the build output. Typically this value is
+# one of I, N, M, S, ...
+buildType=I
+
+# ID of the build. Used in naming the build output.
+buildId=TestBuild
+
+# Label for the build. Used in naming the build output
+buildLabel=${buildType}.${buildId}
+
+# Timestamp for the build. Used in naming the build output
+timestamp=007
+
+# Base location for anything the build needs to compile against. For example,
+# when building GEF, the baseLocation should be the location of a previously
+# installed Eclipse against which the GEF code will be compiled.
+baseLocation=
+
+#Os/Ws/Arch/nl of the eclipse specified by baseLocation
+#baseos
+#basews
+#basearch
+#basenl
+
+# The location underwhich all of the build output will be collected. This will be
+# the root path in the resultant zip file.
+collPlace=eclipse
+
+# The directory in which to execute zip of the ${collPlace} directory
+collBase=.
+
+# The list of {os, ws, arch} configurations to build. This
+# value is a '&' separated list of ',' separate triples. For example,
+# configs=win32,win32,x86 & linux,motif,x86
+# By default the value is *,*,*
+configs=\
+ aix,motif,ppc \
+ & linux,gtk,x86 \
+ & linux,motif,x86 \
+ & qnx,photon,x86 \
+ & solaris,motif,sparc \
+ & win32,win32,x86
+
+#Arguments to send to the zip executable
+zipargs=
+
+############# JAVA COMPILER OPTIONS ##############
+# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
+#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
+
+# 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
+
+# The version of the source code
+#javaSource=1.3
+
+# The version of the byte code targeted
+#javacTarget=1.1
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
new file mode 100644
index 00000000000..99ad4ef9995
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.releng/plugin.xsl b/releng/org.eclipse.cdt.releng/plugin.xsl
index d4594efbeea..b1c1c3bdd40 100644
--- a/releng/org.eclipse.cdt.releng/plugin.xsl
+++ b/releng/org.eclipse.cdt.releng/plugin.xsl
@@ -56,7 +56,7 @@
- http://update.eclipse.org/tools/cdt/updates/builds/1.2
+ http://update.eclipse.org/tools/cdt/updates/builds/2.0
diff --git a/releng/org.eclipse.cdt.releng/site.xsl b/releng/org.eclipse.cdt.releng/site.xsl
index 5d47f301b93..529b4c057e7 100644
--- a/releng/org.eclipse.cdt.releng/site.xsl
+++ b/releng/org.eclipse.cdt.releng/site.xsl
@@ -1,56 +1,69 @@
-
-
-
-
-
-
-
-
-
-
- CDT Build
-
-
-
- CDT Build
-
- -
-
-
-
-
-
-
-
-
-
-
- features/
-
- _
-
- .jar
-
-
-
-
-
-
-
-
-
- CDT Build
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ cdt_
+
+
+
+ CDT Build
+
+
+
+
+
+ features/org.eclipse.cdt_
+
+ .jar
+
+
+
+
+
+
+ cdt_
+
+
+
+
+
+
+ features/org.eclipse.cdt.make_
+
+ .jar
+
+
+
+
+
+
+ cdt_
+
+
+
+
+
+
+ features/org.eclipse.cdt.managedbuilder_
+
+ .jar
+
+
+
+
+
+
+ cdt_
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.releng/testReport.xsl b/releng/org.eclipse.cdt.releng/testReport.xsl
deleted file mode 100644
index a9b6e19863d..00000000000
--- a/releng/org.eclipse.cdt.releng/testReport.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
- Test Results for
-
- Summary Table for
-
-
-
-
-
-
-
-
-
-
- Total |
- Pass |
- Fail |
- Error |
- Pass Rate |
- Time |
-
-
- |
- |
- |
- |
- |
- : |
-
-
-
-
-
-
-
-
- Test Suite:
-
-
-
-
-
- |
- |
-
- ::
-
- **
-
- |
-
-
-
-