From e49984b18ba340d62f919333a4a2d66d82e1ed4b Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 1 May 2014 11:01:46 +0300 Subject: [PATCH] Update to 4.4.0 I-build to make it cope with Java 8. --- .gitignore | 1 + MANIFEST.MF | 28 ++++++++++++++++++++++++++++ ecj-include-props.patch | 8 ++++---- ecj.spec | 23 ++++++++++++++++------- sources | 2 +- 5 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 MANIFEST.MF diff --git a/.gitignore b/.gitignore index f8b8ed1..1068bc0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ecj-gcj.tar.bz2 ecjsrc-4.2.1.jar /ecj.1 +/ecjsrc-I20140430-2000.jar diff --git a/MANIFEST.MF b/MANIFEST.MF new file mode 100644 index 0000000..532d8da --- /dev/null +++ b/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Main-Class: org.eclipse.jdt.internal.compiler.batch.Main +Bundle-ManifestVersion: 2 +Bundle-Name: Eclipse Compiler for Java(TM) +Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch +Bundle-Version: 3.10.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: Eclipse.org +Export-Package: org.eclipse.jdt.core, + org.eclipse.jdt.core.compiler, + org.eclipse.jdt.internal.antadapter;x-internal:=true, + org.eclipse.jdt.internal.compiler;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.dispatch;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.model;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.util;x-internal:=true, + org.eclipse.jdt.internal.compiler.ast;x-internal:=true, + org.eclipse.jdt.internal.compiler.batch;x-internal:=true, + org.eclipse.jdt.internal.compiler.classfmt;x-internal:=true, + org.eclipse.jdt.internal.compiler.codegen;x-internal:=true, + org.eclipse.jdt.internal.compiler.env;x-internal:=true, + org.eclipse.jdt.internal.compiler.flow;x-internal:=true, + org.eclipse.jdt.internal.compiler.impl;x-internal:=true, + org.eclipse.jdt.internal.compiler.lookup;x-internal:=true, + org.eclipse.jdt.internal.compiler.parser;x-internal:=true, + org.eclipse.jdt.internal.compiler.parser.diagnose;x-internal:=true, + org.eclipse.jdt.internal.compiler.problem;x-internal:=true, + org.eclipse.jdt.internal.compiler.util;x-internal:=true, + org.eclipse.jdt.internal.compiler.tool;x-internal:=true diff --git a/ecj-include-props.patch b/ecj-include-props.patch index 990442c..f1b3110 100644 --- a/ecj-include-props.patch +++ b/ecj-include-props.patch @@ -1,7 +1,7 @@ ---- a/build.xml 2012-10-09 13:56:47.695928242 -0400 -+++ b/build.xml 2012-10-09 13:57:06.822893233 -0400 -@@ -46,6 +46,7 @@ - +--- build.xml 2014-05-01 09:36:51.417339328 +0300 ++++ build.xml 2014-05-01 09:38:36.330493400 +0300 +@@ -49,6 +49,7 @@ + + diff --git a/ecj.spec b/ecj.spec index 6f35fb0..439ee83 100644 --- a/ecj.spec +++ b/ecj.spec @@ -1,18 +1,18 @@ Epoch: 1 -%global qualifier 201209141800 +%global qualifier I20140430-2000 %define with_gcjbootstrap %{!?_with_gcjbootstrap:0}%{?_with_gcjbootstrap:1} %define without_gcjbootstrap %{?_with_gcjbootstrap:0}%{!?_with_gcjbootstrap:1} Summary: Eclipse Compiler for Java Name: ecj -Version: 4.2.1 -Release: 10%{?dist} +Version: 4.4.0 +Release: 0.1.git20140430%{?dist} URL: http://www.eclipse.org License: EPL Group: Development/Languages -Source0: http://download.eclipse.org/eclipse/downloads/drops4/R-%{version}-%{qualifier}/%{name}src-%{version}.jar +Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/%{name}src-%{qualifier}.jar Source1: ecj.sh.in # Use ECJ for GCJ # cvs -d:pserver:anonymous@sourceware.org:/cvs/rhug \ @@ -23,6 +23,7 @@ Source2: %{name}-gcj.tar.bz2 # No dependencies are needed for ecj, dependencies are for using of jdt.core which makes no sense outside of eclipse Source3: core-3.3.0-v_771.pom Source4: ecj.1 +Source5: http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/plain/org.eclipse.jdt.core/scripts/binary/META-INF/MANIFEST.MF # Always generate debug info when building RPMs (Andrew Haley) Patch0: %{name}-rpmdebuginfo.patch Patch1: %{name}-defaultto1.5.patch @@ -55,11 +56,12 @@ the JDT Core batch compiler. %prep %setup -q -c %patch0 -p1 -%patch1 -p1 %patch2 -p1 -%patch4 -p1 +%patch4 -b .sav cp %{SOURCE3} pom.xml +mkdir -p scripts/binary/META-INF/ +cp %{SOURCE5} scripts/binary/META-INF/MANIFEST.MF # Use ECJ for GCJ's bytecode compiler tar jxf %{SOURCE2} mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java \ @@ -74,6 +76,10 @@ rm -rf eclipse-gcj rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java cp %{SOURCE4} ecj.1 +sed -i -e "s/1.3/1.6/g" build.xml +sed -i -e "s/1.2/1.6/g" build.xml +sed -i -e "s/Xlint:none/Xdoclint:none -encoding cp1252/g" build.xml + %build %if %{with_gcjbootstrap} # Remove bits of JDT Core we don't want to build @@ -89,7 +95,7 @@ cp %{SOURCE4} ecj.1 find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\ xargs fastjar cf %{name}-%{version}.jar %else - ant + ant %endif gzip ecj.1 @@ -127,6 +133,9 @@ install -pm 644 pom.xml \ %{_mandir}/man1/ecj.1.gz %changelog +* Thu May 1 2014 Alexander Kurtakov 1:4.4.0-0.1.git20140430 +- Update to 4.4.0 I-build to make it cope with Java 8. + * Mon Apr 14 2014 Mat Booth - 1:4.2.1-10 - Drop gcj AOT-compilation support. - Obsolete -native sub-package. diff --git a/sources b/sources index 3bca097..5741c6b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -f603934950639ed6ac2b2527705a69f0 ecjsrc-4.2.1.jar 0af236868ba699f2e55c654b8aca1258 ecj-gcj.tar.bz2 96d507a301eeb8454299a325a9aca31d ecj.1 +d0ec30d76e94e0c81b85955ec4c0e853 ecjsrc-I20140430-2000.jar