diff options
| author | Jayaprakash Arthanareeswaran | 2012-07-25 18:19:21 +0000 |
|---|---|---|
| committer | Jayaprakash Arthanareeswaran | 2012-08-10 06:59:08 +0000 |
| commit | 01586ec11de9b8f56a4994e05b2e825495bf17c2 (patch) | |
| tree | 46409a0e3b5534871f861cbddb6e7614d442123c | |
| parent | bd4749acd27ca7c1d92b10383523328f61b63e14 (diff) | |
| download | eclipse.jdt.core-01586ec11de9b8f56a4994e05b2e825495bf17c2.tar.gz eclipse.jdt.core-01586ec11de9b8f56a4994e05b2e825495bf17c2.tar.xz eclipse.jdt.core-01586ec11de9b8f56a4994e05b2e825495bf17c2.zip | |
Fix for bug 384531: Revert the JAR name to buildLabel instead of the
bundleQualifier
| -rw-r--r-- | org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | 4 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/scripts/export-ecj.xml | 15 |
2 files changed, 10 insertions, 9 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 85828e0761..da33b9fef2 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 = (The placeholder 'bundle_version' will be automatically filled. Do not remove or alter it) -compiler.version = bundle_version +#Format: compiler.version = (The placeholder 'bundle_qualifier' will be automatically filled. Do not remove or alter it) +compiler.version = 3.8.0.bundle_qualifier 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 d6c1c1080c..e47456cdcd 100644 --- a/org.eclipse.jdt.core/scripts/export-ecj.xml +++ b/org.eclipse.jdt.core/scripts/export-ecj.xml @@ -58,7 +58,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="bundle_version" value="${bundleVersion}"/> + <replace file="${ecj-temp-folder}/org/eclipse/jdt/internal/compiler/batch/messages.properties" token="bundle_qualifier" value="${bundleVersionQualifer}"/> </target> <target name="extract-_jsr199" depends="init"> @@ -91,15 +91,16 @@ </target> <target name="export" depends="init"> + <property name="buildLabel" value="head" /> <property name="dest" value="../../ecj-export" /> <mkdir dir="${dest}" /> - <echo message="UPDATE ecj-${bundleVersionQualifer}.jar" /> - <delete file="${dest}/ecj-${bundleVersionQualifer}.jar" failonerror="false"/> + <echo message="UPDATE ecj-${buildLabel}.jar" /> + <delete file="${dest}/ecj-${buildLabel}.jar" failonerror="false"/> <copy todir="${ecj-temp-folder}"> <fileset dir="scripts/binary" /> </copy> <replace file="${ecj-temp-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${bundleVersionQualifer}"/> - <zip zipfile="${dest}/ecj-${bundleVersionQualifer}.jar"> + <zip zipfile="${dest}/ecj-${buildLabel}.jar"> <fileset dir="${ecj-temp-folder}"> <include name="**/*"/> </fileset> @@ -109,13 +110,13 @@ </zip> - <echo message="UPDATE ecjsrc-${bundleVersionQualifer}.jar" /> - <delete file="${dest}/ecjsrc-${bundleVersionQualifer}.jar" 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="${bundleVersionQualifer}"/> - <zip zipfile="${dest}/ecjsrc-${bundleVersionQualifer}.jar"> + <zip zipfile="${dest}/ecjsrc-${buildLabel}.jar"> <zipfileset dir="ecj-temp-src-folder" /> <zipfileset dir="batch"> <exclude name="org/eclipse/jdt/internal/compiler/batch/messages.properties"/> |