aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2012-08-17 23:05:49 (EDT)
committerStephan Herrmann2012-08-20 15:57:20 (EDT)
commitc200ff6a2e44d13b91c04a3bdf5e1a8816f5d7d7 (patch)
treeaaf6983bb900016493dcf2800bc6431f94457179
parentc0b7ec7ac86ca976e8dafca35f37afdb3d3303ce (diff)
downloadeclipse.jdt.core-c200ff6a2e44d13b91c04a3bdf5e1a8816f5d7d7.zip
eclipse.jdt.core-c200ff6a2e44d13b91c04a3bdf5e1a8816f5d7d7.tar.gz
eclipse.jdt.core-c200ff6a2e44d13b91c04a3bdf5e1a8816f5d7d7.tar.bz2
ecj missing version output after built from source
The ecjsrc.jar holds now MANIFEST.MF from scripts/binary/META-INF. The binary manifest is used when building up ecj.jar from ecjsrc.jar. The patch fixes also an exception thrown from Properties$LineReader.readLine(...) caused by missing readableNames.props file. The file was not copied to the built jar. Bug: 374724 Change-Id: I8dd31f6ab5cdca8dd93b3ea9e5147ce9e4ee049c
-rw-r--r--org.eclipse.jdt.core/scripts/build.xml5
-rw-r--r--org.eclipse.jdt.core/scripts/export-ecj.xml9
2 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.jdt.core/scripts/build.xml b/org.eclipse.jdt.core/scripts/build.xml
index d5c52ba..e772a07 100644
--- a/org.eclipse.jdt.core/scripts/build.xml
+++ b/org.eclipse.jdt.core/scripts/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007, 2011 IBM Corporation and others.
+ Copyright (c) 2007, 2012 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
@@ -39,11 +39,14 @@
<compilerarg line="-Xlint:none"/>
</javac>
+ <delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>
+ <copy tofile="${basedir}/META-INF/MANIFEST.MF" file="${basedir}/scripts/binary/META-INF/MANIFEST.MF"/>
<zip destfile="${basedir}/${jar_file}">
<fileset dir="${output}" />
<fileset dir="${basedir}">
<include name="about.html"/>
<include name="**/*.rsc"/>
+ <include name="**/readableNames.props"/>
<include name="META-INF/**"/>
<include name="**/*.properties"/>
<exclude name="META-INF/eclipse.inf"/>
diff --git a/org.eclipse.jdt.core/scripts/export-ecj.xml b/org.eclipse.jdt.core/scripts/export-ecj.xml
index f350b4c..d3a21ab 100644
--- a/org.eclipse.jdt.core/scripts/export-ecj.xml
+++ b/org.eclipse.jdt.core/scripts/export-ecj.xml
@@ -18,7 +18,7 @@
<property name="bundleVersion" value="3.9.0.qualifier"/>
<fail unless="bundleVersion" message="Property 'bundleVersion' must be provided by caller"/>
<condition property="bundleVersionOK">
- <matches pattern="\d\.\d\.\d.*" string="${bundleVersion}"/>
+ <matches pattern="\d\.\d\.\d.*" string="${bundleVersion}"/>
</condition>
<fail message="bundleVersion variable had unexpected format. Should be digit.digit.digit,ANY but was ${bundleVersion}" unless="bundleVersionOK"/>
<script language="javascript">
@@ -109,20 +109,23 @@
</fileset>
</zip>
-
<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>
+ <copy todir="${ecj-temp-src-folder}/scripts/binary">
+ <fileset dir="scripts/binary" />
+ </copy>
<replace file="${ecj-temp-src-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${bundleVersionQualifer}"/>
+ <replace file="${ecj-temp-src-folder}/scripts/binary/META-INF/MANIFEST.MF" token="qualifier" value="${bundleVersionQualifer}"/>
<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"/>
</zipfileset>
<fileset dir="${ecj-temp-folder}">
- <include name="**/messages.properties"/>
+ <include name="**/messages.properties"/>
</fileset>
<zipfileset dir="compiler" />
<zipfileset dir="antadapter">