Attachment 218260 Details for Bug 374777 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

Fix-for-374777-Update-ECJ-compiler-version.patch (text/plain), 2.70 KB, created by Jay Arthanareeswaran

on 2012-07-04 05:58:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Arthanareeswaran

Created: 2012-07-04 05:58:09 EDT

Size: 2.70 KB

patch

obsolete

>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 07e7c55..1ee6b11 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
>@@ -21,8 +21,8 @@
> ### compiler
> #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.C58, 3.8.0
>+#Format: compiler.version = build_qualifier, 0.XXX [, other words (don't forget the comma if adding other words. "build_qualifier" will be automatically filled)]
>+compiler.version = build_qualifier, 4.3
> compiler.copyright = Copyright IBM Corp 2000, 2012. All rights reserved.
> 
> ### progress
>diff --git a/org.eclipse.jdt.core/scripts/export-ecj.xml b/org.eclipse.jdt.core/scripts/export-ecj.xml
>index fc73cb1..7ac2e3d 100644
>--- a/org.eclipse.jdt.core/scripts/export-ecj.xml
>+++ b/org.eclipse.jdt.core/scripts/export-ecj.xml
>@@ -15,6 +15,7 @@
> <project name="Eclipse Batch Compiler" default="export-all" basedir="..">
> 	<target name="init">
> 		<tstamp/>
>+		<property name="buildLabel" value="head" />
> 		<property name="ecj-temp-folder" value="${basedir}/ecj-temp-folder" />
> 		<property name="ecj-temp-src-folder" value="${basedir}/ecj-temp-src-folder" />
> 		<mkdir dir="${ecj-temp-src-folder}" />
>@@ -43,6 +44,7 @@
> 				<exclude name="org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter*.class"/>
> 			</fileset>
> 		</copy>
>+		<replace file="${ecj-temp-folder}/org/eclipse/jdt/internal/compiler/batch/messages.properties" token="build_qualifier" value="${buildLabel}"/>
> 	</target>
> 
> 	<target name="extract-_jsr199" depends="init">
>@@ -102,7 +104,12 @@
> 		<replace file="${ecj-temp-src-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${buildLabel}"/>
> 		<zip zipfile="${dest}/ecjsrc-${buildLabel}.jar">
> 			<zipfileset dir="ecj-temp-src-folder" />
>-			<zipfileset dir="batch" />
>+			<zipfileset dir="batch">
>+				<exclude name="org/eclipse/jdt/internal/compiler/batch/messages.properties"/>
>+			</zipfileset>
>+			<fileset dir="${ecj-temp-folder}">
>+							<include name="**/messages.properties"/>
>+			</fileset>
> 			<zipfileset dir="compiler" />
> 			<zipfileset dir="antadapter">
> 				<exclude name="org/eclipse/jdt/core/CheckDebugAttributes.java"/>
>@@ -117,7 +124,6 @@
> 	</target>
> 
> 	<target name="export_src_bin">
>-		<property name="buildLabel" value="head" />
> 		<property name="dest" value="../../ecj-export" />
> 		<mkdir dir="${dest}" />
> 		<echo message="UPDATE ecj_all.jar" />

Actions: View | Diff

Attachments on bug 374777: 218260 | 219702