[ecj] Update to 4.4 final.
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Jul 3 07:13:35 UTC 2014
commit 1bbffc7485009a1cc5a1646b4380d643f0a7ecaf
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu Jul 3 10:13:41 2014 +0300
Update to 4.4 final.
- Drop gcj patches as gcj is not in Fedora anymore and ecj now requires
1.6.
.gitignore | 1 +
core-3.3.0-v_771.pom | 13 ----------
ecj-4.4.pom | 26 +++++++++++++++++++++
ecj-generatedebuginfo.patch | 21 -----------------
ecj.spec | 47 ++++++++++++--------------------------
eclipse-gcj-compat4.2.1.patch | 20 ----------------
eclipse-gcj-nodummysymbol.patch | 37 ------------------------------
sources | 3 +-
8 files changed, 43 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1068bc0..2080899 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ecj-gcj.tar.bz2
ecjsrc-4.2.1.jar
/ecj.1
/ecjsrc-I20140430-2000.jar
+/ecjsrc-4.4.jar
diff --git a/ecj-4.4.pom b/ecj-4.4.pom
new file mode 100644
index 0000000..3ea7c45
--- /dev/null
+++ b/ecj-4.4.pom
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <!--
+ Originally downloaded here:
+ http://download.eclipse.org/eclipse/downloads/drops4/R-4.4-201406061215/#JDTCORE
+ -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>4.4</version>
+ <packaging>jar</packaging>
+ <name>Eclipse ECJ</name>
+ <description>Eclipse JDT Core Batch Compiler</description>
+ <url>http://www.eclipse.org/jdt/</url>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+ <licenses>
+ <license>
+ <name>Eclipse Public License v1.0</name>
+ <url>http://www.eclipse.org/org/documents/epl-v10.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
\ No newline at end of file
diff --git a/ecj.spec b/ecj.spec
index 7cbd99a..b1c73db 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,39 +1,29 @@
Epoch: 1
-%global qualifier I20140430-2000
+%global qualifier R-4.4-201406061215
Summary: Eclipse Compiler for Java
Name: ecj
Version: 4.4.0
-Release: 0.4.git20140430%{?dist}
+Release: 1%{?dist}
URL: http://www.eclipse.org
License: EPL
Group: Development/Languages
-Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/%{name}src-%{qualifier}.jar
+Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/%{name}src-4.4.jar
Source1: ecj.sh.in
-# Use ECJ for GCJ
-# cvs -d:pserver:anonymous at sourceware.org:/cvs/rhug \
-# export -D 2009-09-28 eclipse-gcj
-# tar cjf ecj-gcj.tar.bz2 eclipse-gcj
-Source2: %{name}-gcj.tar.bz2
-#Patched from http://repo2.maven.org/maven2/org/eclipse/jdt/core/3.3.0-v_771/core-3.3.0-v_771.pom
+#Patched from http://central.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom
# 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
+Source3: ecj-4.4.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}-generatedebuginfo.patch
-# Patches Source2 for compatibility with newer ecj
-Patch2: eclipse-gcj-compat4.2.1.patch
# build.xml fails to include a necessary .props file in the built ecj.jar
-Patch3: %{name}-include-props.patch
-Patch4: eclipse-gcj-nodummysymbol.patch
+Patch1: %{name}-include-props.patch
BuildArch: noarch
BuildRequires: gzip
-
BuildRequires: ant
BuildRequires: java-devel >= 1:1.7.0
@@ -49,30 +39,19 @@ the JDT Core batch compiler.
%prep
%setup -q -c
%patch0 -p1
-%patch1 -p1
-%patch3 -b .sav
+%patch1 -b .sav
+
+sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
+sed -i -e "s/Xlint:none/Xlint:none -encoding cp1252/g" build.xml
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 \
- org/eclipse/jdt/internal/compiler/batch/
-%patch2 -p1
-%patch4 -p1
-cat eclipse-gcj/gcc.properties >> \
- org/eclipse/jdt/internal/compiler/batch/messages.properties
-rm -rf eclipse-gcj
# JDTCompilerAdapter isn't used by the batch compiler
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/Xlint:none -encoding cp1252/g" build.xml
-
%build
ant
gzip ecj.1
@@ -98,7 +77,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jdt.core.compiler:ecj,org.eclipse.jdt:org.eclipse.jdt.core" JPP-%{name}.pom %{name}.jar
+%add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jdt:core,org.eclipse.jdt:org.eclipse.jdt.core" JPP-%{name}.pom %{name}.jar
%files -f .mfiles
%doc about.html
@@ -110,6 +89,10 @@ install -pm 644 pom.xml \
%{_mandir}/man1/ecj.1.gz
%changelog
+* Thu Jul 3 2014 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.0-1
+- Update to 4.4 final.
+- Drop gcj patches as gcj is not in Fedora anymore and ecj now requires 1.6.
+
* Thu Jun 12 2014 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.0-0.4.git20140430
- Add additional depmap for maven.
diff --git a/sources b/sources
index 5741c6b..0b1dd47 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-0af236868ba699f2e55c654b8aca1258 ecj-gcj.tar.bz2
96d507a301eeb8454299a325a9aca31d ecj.1
-d0ec30d76e94e0c81b85955ec4c0e853 ecjsrc-I20140430-2000.jar
+a5f9cc5078dd8f04feb53b6bac0b4e37 ecjsrc-4.4.jar
More information about the scm-commits
mailing list