From c5102cafc424cef4cbe5e89f4874456a35fc61ed Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Fri, 16 Jul 2004 18:12:17 +0000
Subject: [PATCH] Updated the build scripts to clean things up a bit and to get
 rid of the nightly build update site.

---
 releng/org.eclipse.cdt.releng/build.sh        |   3 +-
 releng/org.eclipse.cdt.releng/build.xml       |  58 +++++---
 releng/org.eclipse.cdt.releng/buildindex.html | 124 ++++++++++++++++++
 releng/org.eclipse.cdt.releng/maps/cdt.map    |   1 +
 releng/org.eclipse.cdt.releng/message.in      |   5 +-
 .../platform/build.properties                 |  14 +-
 .../platform/customTargets.xml                |  49 ++++---
 .../sdk/build.properties                      |  14 +-
 .../sdk/customTargets.xml                     |  49 ++++---
 9 files changed, 239 insertions(+), 78 deletions(-)
 create mode 100644 releng/org.eclipse.cdt.releng/buildindex.html

diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index 39e676697cd..ff583a58e7d 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -3,7 +3,8 @@
 
 export JAVA_HOME=/opt/java/j2sdk1.4.2_03
 export PATH=$JAVA_HOME/bin:$PATH
+export ECLIPSE_HOME=~/eclipse/3.0/eclipse
 
 cd `dirname $0`
 
-java -cp ../org.eclipse.releng.basebuilder/startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $* 2>&1 | tee build.log
+java -cp $ECLIPSE_HOME/startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $* 2>&1 | tee build.log
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 5447e141669..219d49be744 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -1,6 +1,6 @@
 <project default="zips">
 
-	<target name="build" depends="zips,test"/>
+	<target name="build" depends="zips"/>
 	<target name="nightly" depends="build,upload,mail"/>
 	<target name="integration" depends="nightly,wswbmap"/>
 	<target name="milestone" depends="nightly,milestoneSite"/>
@@ -8,25 +8,24 @@
 	<target name="init">
 		<touch file="${user.home}/.cvspass" />
 		<tstamp/>
+		<property name="branchVersion" value="2.1.0"/>
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
 		<property name="buildDirectory" value="${basedir}/results" />
 		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.0.0/scripts"/>
+		<property name="pde.build.scripts" value="${eclipse.home}/plugins/org.eclipse.pde.build_3.0.0/scripts"/>
 		<property name="eclipseZip" value="eclipse-SDK.zip"/>
 		<property name="collectingFolder" value="eclipse"/>
 		<property name="archivePrefix" value="eclipse"/>
 		<property name="buildType" value="I" />
 		<property name="buildId" value="${buildType}${timestamp}"/>
-		<property name="siteurl" value="http://update.eclipse.org/tools/cdt/updates/builds/2.0"/>
-		<property name="remotedir" value="download.eclipse.org:/home/www/tools/cdt/updates/builds/2.0"/>
 		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
-		<property name="sitedir" value="${buildDirectory}/build.site"/>
-		<property name="siteversion" value="2.0.0"/>
 		<property name="milestonedir" value="${buildDirectory}/${milestone}"/>
 		<property name="buildingOSGi" value="true"/>
 		<property name="messagefile" value="message.in"/>
 		<property name="mailto" value="cdt-test-dev@eclipse.org"/>
-		<property name="mapVersionTag" value="HEAD"/>
+		<property name="remotedir" value="${cdtuser}:${cdtpasswd}@download.eclipse.org:/home/www/tools/cdt/builds/${branchVersion}"/>
+		<property name="cdtserver" value="download.eclipse.org"/>
+		<property name="cdtdir" value="/home/www/tools/cdt/builds/${branchVersion}"/>
 	</target>
 
 	<target name="fetch" depends="init">
@@ -55,13 +54,18 @@
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="builder" value="${basedir}/sdk" />
 		</ant>
-		<concat destfile="compile.log">
+		<concat destfile="${zipsdir}/compile.log">
 			<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
 		</concat>
-		<loadfile property="compileLog" srcFile="compile.log"/>
+		<loadfile property="compileLog" srcFile="${zipsdir}/compile.log"/>
 		<condition property="hasErrors">
 			<contains string="${compileLog}" substring="ERROR"/>
 		</condition>
+		<copy file="buildindex.html" tofile="${zipsdir}/index.html"/>
+		<replace file="${zipsdir}/index.html">
+			<replacefilter token="@branchVersion@" value="${branchVersion}"/>
+			<replacefilter token="@buildId@" value="${buildId}"/>
+		</replace>
 	</target>
 
 	<target name="test" depends="init" unless="hasErrors">
@@ -87,9 +91,25 @@
 	</target>
 	
 	<target name="upload" depends="init" unless="hasErrors">
-		<scp todir="${cdtuser}:${cdtpasswd}@${remotedir}">
-			<fileset dir="${sitedir}"/>
-		</scp>
+		<ftp action="get" server="${cdtserver}" remotedir="${cdtdir}" userid="${cdtuser}" password="${cdtpasswd}">
+			<fileset file="index.html"/>
+		</ftp>
+		<replace file="index.html">
+			<replacetoken><![CDATA[  <!-- add here -->]]></replacetoken>
+			<replacevalue><![CDATA[  <li><a href="@buildId@/index.html">@buildId@</a></li>
+  <!-- add here -->]]></replacevalue>
+		</replace>
+		<replace file="index.html">
+			<replacefilter token="@buildType@" value="${buildType}"/>
+			<replacefilter token="@buildId@" value="${buildId}"/>
+		</replace>
+		<ftp server="${cdtserver}" remotedir="${cdtdir}" userid="${cdtuser}" password="${cdtpasswd}">
+			<fileset file="index.html"/>
+		</ftp>
+		<ftp action="mkdir" server="${cdtserver}" remotedir="${cdtdir}/${buildId}" userid="${cdtuser}" password="${cdtpasswd}"/>
+		<ftp server="${cdtserver}" remotedir="${cdtdir}/${buildId}" userid="${cdtuser}" password="${cdtpasswd}">
+			<fileset dir="${zipsdir}"/>
+		</ftp>
 	</target>
 	
 	<target name="wswbmap" depends="init" unless="hasErrors">
@@ -107,18 +127,18 @@
 	
 	<target name="mailPass" unless="hasErrors">
 		<copy file="${messagefile}" tofile="message.txt" overwrite="true"/>
-		<replace file="message.txt" token="@buildId@" value="${buildId}"/>
-		<concat destfile="mail.txt">
-			<filelist dir="${basedir}" files="message.txt,compile.log"/>
-		</concat>
-		<mail subject="CDT Build ${siteversion}.${timestamp} completed"
+		<replace file="message.txt">
+			<replacefilter token="@branchVersion@" value="${branchVersion}"/>
+			<replacefilter token="@buildId@" value="${buildId}"/>
+		</replace>
+		<mail subject="CDT ${branchVersion} Build ${buildId} completed"
 			tolist="${mailto}" from="dschaefe@ca.ibm.com">
-			<message src="mail.txt"/>
+			<message src="message.txt"/>
 		</mail>
 	</target>
 
 	<target name="mailFail" if="hasErrors">
-		<mail subject="CDT Build ${siteversion}.${timestamp} failed"
+		<mail subject="CDT ${branchVersion} Build ${buildId} failed"
 			tolist="${mailto}" from="dschaefe@ca.ibm.com">
 			<message src="compile.log"/>
 		</mail>
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
new file mode 100644
index 00000000000..039c2093779
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -0,0 +1,124 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>CDT @branchVersion@ Build @buildId@</title>
+</head>
+<body>
+<h2>CDT @branchVersion@ Build @buildId@</h2>
+<p><a href="compile.log">Compile Log</a><br>
+</p>
+<h3>CDT Runtime Feature</h3>
+<p>includes editor, search, builders, launch, debug, gnu toolchain
+integrations for build/debug, user documentation<br>
+</p>
+<table cellpadding="2" cellspacing="2" border="1"
+ style="text-align: left; width: 100%;">
+  <tbody>
+    <tr>
+      <td style="vertical-align: top;">AIX/ppc</td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.zip">org.eclipse.cdt-@branchVersion@-@buildId@-aix.ppc.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">HPUX/PA_RISC<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.zip">org.eclipse.cdt-@branchVersion@-@buildId@-hpux.PA_RISC.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Linux/x86<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip</a></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">MacOSX/ppc<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz">org.eclipse.cdt-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">QNX/x86<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-qnx.x86.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Solaris/sparc<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.zip">org.eclipse.cdt-@branchVersion@-@buildId@-solaris.sparc.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Win32/x86<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-win32.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-win32.x86.zip</a><br>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<br>
+<h3>CDT SDK Feature</h3>
+<p>superset of runtime that adds source and extension point schemas</p>
+<table cellpadding="2" cellspacing="2" border="1"
+ style="text-align: left; width: 100%;">
+  <tbody>
+    <tr>
+      <td style="vertical-align: top;">AIX/ppc</td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-aix.ppc.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">HPUX/PA_RISC<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-hpux.PA_RISC.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Linux/x86<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip</a></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">MacOSX/ppc<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-macosx.ppc.tar.gz">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-macosx.ppc.tar.gz</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">QNX/x86<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-qnx.x86.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Solaris/sparc<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-solaris.sparc.zip</a><br>
+      </td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Win32/x86<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-win32.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-win32.x86.zip</a><br>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<br>
+<br>
+</body>
+</html>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 1817094859b..45365cb8a9f 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -26,6 +26,7 @@ feature@org.eclipse.cdt=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org
 
 fragment@org.eclipse.cdt.core.aix=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-core/org.eclipse.cdt.core.aix
 fragment@org.eclipse.cdt.core.linux=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-core/org.eclipse.cdt.core.linux
+fragment@org.eclipse.cdt.core.macosx=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-core/org.eclipse.cdt.core.macosx
 fragment@org.eclipse.cdt.core.qnx=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-core/org.eclipse.cdt.core.qnx
 fragment@org.eclipse.cdt.core.solaris=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-core/org.eclipse.cdt.core.solaris
 fragment@org.eclipse.cdt.core.win32=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt-core/org.eclipse.cdt.core.win32
diff --git a/releng/org.eclipse.cdt.releng/message.in b/releng/org.eclipse.cdt.releng/message.in
index c668b758d41..8600e42f5c2 100644
--- a/releng/org.eclipse.cdt.releng/message.in
+++ b/releng/org.eclipse.cdt.releng/message.in
@@ -1,9 +1,6 @@
 The build is available at
 
-	http://update.eclipse.org/tools/cdt/updates/builds/2.0
+	http://download.eclipse.org/tools/cdt/builds/@branchVersion@/@buildId@
 
 Cheers,
 dschaefer2, the buildmaster...
-
---- Compile logs ---
-
diff --git a/releng/org.eclipse.cdt.releng/platform/build.properties b/releng/org.eclipse.cdt.releng/platform/build.properties
index 8fa84bdf6bc..59eb35b9f48 100644
--- a/releng/org.eclipse.cdt.releng/platform/build.properties
+++ b/releng/org.eclipse.cdt.releng/platform/build.properties
@@ -60,13 +60,13 @@ collBase=.
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
-      aix,motif,ppc \
-    & hpux,motif,PA_RISC \
-    & linux,gtk,x86 \
-    & linux,motif,x86 \
-    & qnx,photon,x86 \
-    & solaris,motif,sparc \
-    & win32,win32,x86
+      aix,*,ppc \
+    & hpux,*,PA_RISC \
+    & linux,*,x86 \
+    & macosx,*,ppc \
+    & qnx,*,x86 \
+    & solaris,*,sparc \
+    & win32,*,x86
 
 #Arguments to send to the zip executable
 zipargs=
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index 6af28517324..3c04bfc27cf 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -23,32 +23,46 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.aix.motif.ppc">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.aix.*.ppc">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-aix.ppc.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.hpux.motif.PA_RISC">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.hpux.*.PA_RISC">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-hpux.PA_RISC.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.gtk.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.linux.*.x86">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.motif.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.macosx.*.ppc">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.qnx.photon.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.qnx.*.x86">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-qnx.x86.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.solaris.motif.sparc">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.solaris.*.sparc">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-solaris.sparc.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.win32.win32.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.win32.*.x86">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-win32.x86.zip"/>
+	</ant>
 </target>
 
 <!-- ===================================================================== -->
@@ -56,12 +70,7 @@
 <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
 <!-- ===================================================================== -->
 <target name="getMapFiles">
-	<cvs
-		cvsRoot=":pserver:anonymous@dev.eclipse.org:/home/tools"
-		package="org.eclipse.cdt-releng/org.eclipse.cdt.releng/maps/cdt.map"
-		dest="${buildDirectory}/maps"
-		tag="${mapVersionTag}"
-	/>
+	<copy file="${builder}/../maps/cdt.map" todir="${buildDirectory}/maps"/>
 </target>
 
 <!-- ===================================================================== -->
diff --git a/releng/org.eclipse.cdt.releng/sdk/build.properties b/releng/org.eclipse.cdt.releng/sdk/build.properties
index 5ddb074eb83..096390d9b58 100644
--- a/releng/org.eclipse.cdt.releng/sdk/build.properties
+++ b/releng/org.eclipse.cdt.releng/sdk/build.properties
@@ -60,13 +60,13 @@ collBase=.
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
-      aix,motif,ppc \
-    & hpux,motif,PA_RISC \
-    & linux,gtk,x86 \
-    & linux,motif,x86 \
-    & qnx,photon,x86 \
-    & solaris,motif,sparc \
-    & win32,win32,x86
+      aix,*,ppc \
+    & hpux,*,PA_RISC \
+    & linux,*,x86 \
+    & macosx,*,ppc \
+    & qnx,*,x86 \
+    & solaris,*,sparc \
+    & win32,*,x86
 
 #Arguments to send to the zip executable
 zipargs=
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index 9deff37e70c..5c1bd01519d 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -23,32 +23,46 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.aix.*.ppc">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-aix.ppc.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.hpux.motif.PA_RISC">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.hpux.*.PA_RISC">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-hpux.PA_RISC.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.linux.*.x86">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.motif.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.macosx.*.ppc">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.qnx.*.x86">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-qnx.x86.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.solaris.*.sparc">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-solaris.sparc.zip"/>
+	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+<target name="assemble.org.eclipse.cdt.sdk.win32.*.x86">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-win32.x86.zip"/>
+	</ant>
 </target>
 
 <!-- ===================================================================== -->
@@ -56,12 +70,7 @@
 <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
 <!-- ===================================================================== -->
 <target name="getMapFiles">
-	<cvs
-		cvsRoot=":pserver:anonymous@dev.eclipse.org:/home/tools"
-		package="org.eclipse.cdt-releng/org.eclipse.cdt.releng/maps/cdt.map"
-		dest="${buildDirectory}/maps"
-		tag="${mapVersionTag}"
-	/>
+	<copy file="${builder}/../maps/cdt.map" todir="${buildDirectory}/maps"/>
 </target>
 
 <!-- ===================================================================== -->