Bug 268772 [releng] Move e4 up to M6
Pick up the released M6 update sites and repos
diff --git a/org.eclipse.e4.builder/builder/general/build.properties b/org.eclipse.e4.builder/builder/general/build.properties
index 95087ce..5637e63 100644
--- a/org.eclipse.e4.builder/builder/general/build.properties
+++ b/org.eclipse.e4.builder/builder/general/build.properties
@@ -190,19 +190,19 @@
eclipseBaseName=eclipse-SDK-${eclipseBuildId}-linux-gtk${archProp}.tar.gz
eclipseTestName=eclipse-Automated-Tests-${eclipseBuildId}.zip
-emfBuildId=I200903101800
+emfBuildId=S200903161215
emfBaseURL=http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/${emfBuildId}
-emfBaseName=emf-runtime-2.5.0M5.zip
+emfBaseName=emf-runtime-2.5.0M6.zip
#WST requirements
xsdBaseName=xsd-runtime-2.5.0M5.zip
-gefBaseURL=http://download.eclipse.org/tools/gef/downloads/drops/3.5.0/I200903061148
-gefBaseName=GEF-SDK-3.5.0M5.zip
+gefBaseURL=http://download.eclipse.org/tools/gef/downloads/drops/3.5.0/S200903161602
+gefBaseName=GEF-SDK-3.5.0M6.zip
#WST
-wstBaseURL=http://download.eclipse.org/webtools/downloads/drops/R3.1/S-3.1M6-20090315011944
-wstBaseName=wtp-wst-S-3.1M5-20090206233640.zip
+wstBaseURL=http://download.eclipse.org/webtools/downloads/drops/R3.1/S-3.1M6-20090318020101
+wstBaseName=wst-sdk-buildrepo-S-3.1M6-20090318020101.zip
diff --git a/org.eclipse.e4.builder/scripts/masterBuild.sh b/org.eclipse.e4.builder/scripts/masterBuild.sh
index 1cda8fa..77f3cd7 100755
--- a/org.eclipse.e4.builder/scripts/masterBuild.sh
+++ b/org.eclipse.e4.builder/scripts/masterBuild.sh
@@ -57,7 +57,7 @@
buildDir=${supportDir}/downloads/drops/4.0.0
targetDir=${buildDir}/targets
targetZips=$targetDir/downloads
- untransformedRepo=${targetDir}/galileo-repo-m6-cand
+ untransformedRepo=${targetDir}/galileo-repo-m6
buildDirectory=$buildDir/I$buildTimestamp
testDir=$buildDirectory/tests
buildResults=$buildDirectory/I$buildTimestamp
diff --git a/org.eclipse.e4.builder/templates/build.index.html b/org.eclipse.e4.builder/templates/build.index.html
index b597d76..389f0ce 100644
--- a/org.eclipse.e4.builder/templates/build.index.html
+++ b/org.eclipse.e4.builder/templates/build.index.html
@@ -68,8 +68,8 @@
<li>Eclipse SDK <a href="@eclipseBaseURL@">@eclipseIbuild@</a></li>
<li>EMF runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
<li>XSD runtime <a href="@emfBaseURL@">@emfBuildId@</a></li>
- <li>GEF SDK <a href="@gefBaseURL@">I200903061148</a></li>
- <li>WST SDK <a href="@wstBaseURL@">S-3.1M6-20090315011944</a></li>
+ <li>GEF SDK <a href="@gefBaseURL@">S200903161602</a></li>
+ <li>WST SDK <a href="@wstBaseURL@">S-3.1M6-20090318020101</a></li>
</ul></p>
</td>
</tr>
