Attachment 180908 Details for Bug 327817 – Proposed fix

[patch] Proposed fix

patch_327817.txt (text/plain), 5.28 KB, created by Olivier Thomann

on 2010-10-14 15:30:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-10-14 15:30:00 EDT

Size: 5.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.compiler.apt
>Index: customBuildCallbacks.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.apt/customBuildCallbacks.xml,v
>retrieving revision 1.7
>diff -u -r1.7 customBuildCallbacks.xml
>--- customBuildCallbacks.xml	11 May 2010 18:49:23 -0000	1.7
>+++ customBuildCallbacks.xml	14 Oct 2010 19:29:12 -0000
>@@ -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>
> 
> 	
> 	
>@@ -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}">
>#P org.eclipse.jdt.compiler.tool
>Index: customBuildCallbacks.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.compiler.tool/customBuildCallbacks.xml,v
>retrieving revision 1.11
>diff -u -r1.11 customBuildCallbacks.xml
>--- customBuildCallbacks.xml	28 Apr 2009 16:36:50 -0000	1.11
>+++ customBuildCallbacks.xml	14 Oct 2010 19:29:13 -0000
>@@ -1,5 +1,5 @@
> <?xml version="1.0" encoding="UTF-8"?>

>@@ -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}">
>#P org.eclipse.jdt.core
>Index: scripts/export-ecj.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/scripts/export-ecj.xml,v
>retrieving revision 1.20
>diff -u -r1.20 export-ecj.xml
>--- scripts/export-ecj.xml	13 May 2010 13:30:15 -0000	1.20
>+++ scripts/export-ecj.xml	14 Oct 2010 19:29:13 -0000
>@@ -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" />

Actions: View | Diff

Attachments on bug 327817: 180907 | 180908