From d7b07431690ae733ed0d673c18013d84b426f0ac Mon Sep 17 00:00:00 2001
From: Vivian Kong <vivkong@ca.ibm.com>
Date: Mon, 26 May 2008 15:49:21 +0000
Subject: [PATCH] *** empty log message ***

---
 releng/org.eclipse.cdt.releng/build.sh  |  2 +-
 releng/org.eclipse.cdt.releng/build.xml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index 3d2870a81ab..590e9f01913 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -28,7 +28,7 @@ umask 0022
 mkdir -p tools
 cd tools
 cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse \
-	checkout -r RC1_34 org.eclipse.releng.basebuilder
+	checkout -r M5_34 org.eclipse.releng.basebuilder
 cd ..
 
 # Let's go!
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index fc8d4870c08..1247cfa3d13 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -13,7 +13,7 @@
 	<target name="init">
 		<touch file="${user.home}/.cvspass" />
 		<tstamp/>
-		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/S-3.4RC2-200805230100/eclipse-SDK-3.4RC2-linux-gtk-ppc.tar.gz"/>
+		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/S-3.4M6-200803301350/eclipse-SDK-3.4M6-linux-gtk-ppc.tar.gz"/>
 		<property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/mylyn-2.3.2-e3.4.zip"/>
 		<property name="branchVersion" value="5.0.0"/>
 		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
@@ -21,7 +21,7 @@
 		<property name="buildingOSGi" value="true"/>
 		<property name="buildDirectory" value="${basedir}/results" />
 		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${eclipse.pdebuild.scripts}"/>
+		<property name="pde.build.scripts" value="${eclipse.home}/plugins/org.eclipse.pde.build/scripts"/>
 		<property name="collectingFolder" value="eclipse"/>
 		<property name="archivePrefix" value="eclipse"/>
 		<property name="buildType" value="I" />
@@ -140,12 +140,12 @@
 		<unzip src="${zipsdir}/cdt-master-${branchVersion}-${buildId}.zip"
 			dest="${buildDirectory}/eclipse"/>
 		<unjar src="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}.jar"
-			dest="${buildDirectory}/eclipse/dropins/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}"/>
+			dest="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${timestamp}"/>
 		<unjar src="${buildDirectory}/eclipse/plugins/${eclipseTest}.jar"
-			dest="${buildDirectory}/eclipse/dropins/eclipse/plugins/${eclipseTest}"/>
-		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/dropins/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${forceContextQualifier}">
+			dest="${buildDirectory}/eclipse/plugins/${eclipseTest}"/>
+		<ant antfile="test.xml" dir="${buildDirectory}/eclipse/plugins/org.eclipse.cdt.testing_${branchVersion}.${forceContextQualifier}">
 			<property name="eclipse-home" value="${buildDirectory}/eclipse"/>
-			<property name="library-file" value="${buildDirectory}/eclipse/dropins/eclipse/plugins/${eclipseTest}/library.xml"/>
+			<property name="library-file" value="${buildDirectory}/eclipse/plugins/${eclipseTest}/library.xml"/>
 			<property name="os" value="${baseos}"/>
 			<property name="ws" value="${basews}"/>
 			<property name="arch" value="${basearch}"/>