HEAD - Fix for 327817

5 files changed, 28 insertions, 17 deletions

diff --git a/org.eclipse.jdt.compiler.apt/customBuildCallbacks.xml b/org.eclipse.jdt.compiler.apt/customBuildCallbacks.xml
index 0efee973d2..8d77b19211 100644
--- a/org.eclipse.jdt.compiler.apt/customBuildCallbacks.xml
+++ b/org.eclipse.jdt.compiler.apt/customBuildCallbacks.xml
@@ -42,9 +42,7 @@
 		<mkdir dir="${dest}/checksum" />
 		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" />
 		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" />
-		<checksum file="${dest}/ecjsrc-${buildLabel}.zip" property="md5-ecjsrc.zip" />
-		<echo message="${md5-ecjsrc.zip} ecjsrc-${buildLabel}.zip" file="${dest}/checksum/ecjsrc-${buildLabel}.zip.md5" />
-	</target>
+		<checksum file="${dest}/ecjsrc-${buildLabel}.jar" property="md5-ecjsrc.jar" /> 
		<echo message="${md5-ecjsrc.jar} ecjsrc-${buildLabel}.jar" file="${dest}/checksum/ecjsrc-${buildLabel}.jar.md5" /> 
	</target>
 
 	<!-- ===================================================================== -->
 	<!-- Steps to do before the target build.sources                           -->
@@ -110,13 +108,13 @@
 		</zip>
 		<delete dir="${unjarDestBin}" failonerror="false"/>
 
-		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
+		<echo message="UPDATE ecjsrc-${buildLabel}.jar" />
 		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
 		<mkdir dir="${unjarDestSrc}"/>
 		<unzip
-			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip"
+			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar"
 			dest="${unjarDestSrc}"/>
-		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip">
+		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar">
 			<zipfileset dir="src" />
 			<zipfileset dir="${unjarDestSrc}"/>
 			<zipfileset dir="${basedir}">
diff --git a/org.eclipse.jdt.compiler.tool/customBuildCallbacks.xml b/org.eclipse.jdt.compiler.tool/customBuildCallbacks.xml
index de7cd9bfc1..8b4bd471f0 100644
--- a/org.eclipse.jdt.compiler.tool/customBuildCallbacks.xml
+++ b/org.eclipse.jdt.compiler.tool/customBuildCallbacks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
<!--
-    Copyright (c) 2006, 2009 IBM Corporation and others.
+    Copyright (c) 2006, 2010 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
@@ -42,8 +42,8 @@
 		<mkdir dir="${dest}/checksum" />
 		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" /> 
 		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" /> 
-		<checksum file="${dest}/ecjsrc-${buildLabel}.zip" property="md5-ecjsrc.zip" /> 
-		<echo message="${md5-ecjsrc.zip} ecjsrc-${buildLabel}.zip" file="${dest}/checksum/ecjsrc-${buildLabel}.zip.md5" /> 
+		<checksum file="${dest}/ecjsrc-${buildLabel}.jar" property="md5-ecjsrc.jar" /> 
+		<echo message="${md5-ecjsrc.jar} ecjsrc-${buildLabel}.jar" file="${dest}/checksum/ecjsrc-${buildLabel}.jar.md5" /> 
 	</target>
 
 	<!-- ===================================================================== -->
@@ -113,13 +113,13 @@
 		</zip>
 		<delete dir="${unjarDestBin}" failonerror="false"/>
 
-		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
+		<echo message="UPDATE ecjsrc-${buildLabel}.jar" />
 		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
 		<mkdir dir="${unjarDestSrc}"/>
 		<unzip
-			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip"
+			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar"
 			dest="${unjarDestSrc}"/>
-		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip">
+		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar">
 			<zipfileset dir="src" />
 			<zipfileset dir="${unjarDestSrc}" />
 			<zipfileset dir="${basedir}">
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index 9e274ff9c4..74806ca750 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -15,7 +15,7 @@
 #Format: compiler.name = word1 word2 word3
 compiler.name = Eclipse Compiler for Java(TM)
 #Format: compiler.version = 0.XXX[, other words (don't forget the comma if adding other words)]
-compiler.version = 0.B17, 3.7.0 M3
+compiler.version = 0.B18, 3.7.0 M3
 compiler.copyright = Copyright IBM Corp 2000, 2010. All rights reserved.
 
 ### progress
diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
index 47c7403a81..8c941fc03c 100644
--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
@@ -40,11 +40,24 @@
 	</td>
   </tr>
 </table>
+<a name="v_B18"></a>
+<hr><h1>
+Eclipse Platform Build Notes<br>
+Java development tools core</h1>
+Eclipse SDK 3.7M3 - %date% - 3.7.0 M3
+<br>Project org.eclipse.jdt.core v_B18
+(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_B18">cvs</a>).
+<h2>What's new in this drop</h2>
+
+<h3>Problem Reports Fixed</h3>
+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=327817">327817</a>
+ecjsrc.zip should be ecjsrc.jar
+
 <a name="v_B17"></a>
 <hr><h1>
 Eclipse Platform Build Notes<br>
 Java development tools core</h1>
-Eclipse SDK 3.7M3 - October 12, 2010 - 3.7.0 M3
+Eclipse SDK 3.7M3 - October 12, 2010
 <br>Project org.eclipse.jdt.core v_B17
 (<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_B17">cvs</a>).
 <h2>What's new in this drop</h2>
diff --git a/org.eclipse.jdt.core/scripts/export-ecj.xml b/org.eclipse.jdt.core/scripts/export-ecj.xml
index c4ec3baab4..ee50589013 100644
--- a/org.eclipse.jdt.core/scripts/export-ecj.xml
+++ b/org.eclipse.jdt.core/scripts/export-ecj.xml
@@ -93,13 +93,13 @@
 		</zip>
 
 
-		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
-		<delete file="${dest}/ecjsrc-${buildLabel}.zip" failonerror="false"/>
+		<echo message="UPDATE ecjsrc-${buildLabel}.jar" />
+		<delete file="${dest}/ecjsrc-${buildLabel}.jar" failonerror="false"/>
 		<copy todir="${ecj-temp-src-folder}">
 			<fileset dir="scripts/source" />
 		</copy>
 		<replace file="${ecj-temp-src-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${buildLabel}"/>
-		<zip zipfile="${dest}/ecjsrc-${buildLabel}.zip">
+		<zip zipfile="${dest}/ecjsrc-${buildLabel}.jar">
 			<zipfileset dir="ecj-temp-src-folder" />
 			<zipfileset dir="batch" />
 			<zipfileset dir="compiler" />