Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJayaprakash Arthanareeswaran2012-07-09 16:24:39 +0000
committerJayaprakash Arthanareeswaran2012-07-09 16:24:39 +0000
commitb349d60b6a800b223aee4dca1924d2fdf0926843 (patch)
tree749c328c27f347a72f339fe1f4e354df1f707849
parent8d19f5a1e4b345e3efd30be48a0614ea130c9e08 (diff)
downloadeclipse.jdt.core-I20120710-0800.tar.gz
eclipse.jdt.core-I20120710-0800.tar.xz
eclipse.jdt.core-I20120710-0800.zip
Fix for bug 374777: Update ECJ compiler version property duringv20120709-162439I20120710-0800
auto-tagging
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties4
-rw-r--r--org.eclipse.jdt.core/scripts/export-ecj.xml10
2 files changed, 10 insertions, 4 deletions
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 07e7c55bb8..125be17287 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, 3.8.1
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 fc73cb1ac5..7ac2e3d597 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" />

Back to the top