Update to latest upstream release

This commit is contained in:
Mat Booth 2020-06-18 14:49:35 +01:00
parent 4d6c1866fc
commit 49d843cc10
4 changed files with 20 additions and 12 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/ecj-*/ /ecj-*/
/ecjsrc-*.jar /ecjsrc-*.jar
/java10api.jar /java10api.jar
/java14api.jar

View File

@ -18,7 +18,7 @@ Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
-internal:=true,org.eclipse.jdt.internal.compiler.tool;x-internal:=tr -internal:=true,org.eclipse.jdt.internal.compiler.tool;x-internal:=tr
ue ue
Bundle-Name: Eclipse Compiler for Java(TM) Bundle-Name: Eclipse Compiler for Java(TM)
Bundle-Version: 3.21.0.v20200304-1404 Bundle-Version: 3.22.0.v20200530-2032
Bundle-ClassPath: . Bundle-ClassPath: .
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Vendor: Eclipse.org Bundle-Vendor: Eclipse.org

View File

@ -1,20 +1,20 @@
Epoch: 1 Epoch: 1
%global qualifier R-4.15-202003050155 %global qualifier R-4.16-202006040540
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
Name: ecj Name: ecj
Version: 4.15 Version: 4.16
Release: 1%{?dist} Release: 1%{?dist}
URL: http://www.eclipse.org URL: http://www.eclipse.org
License: EPL-2.0 License: EPL-2.0
Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar
Source1: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.21.0/ecj-3.21.0.pom Source1: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.22.0/ecj-3.22.0.pom
# Extracted from https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/%%{qualifier}/ecj-%%{version}.jar # Extracted from https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/%%{qualifier}/ecj-%%{version}.jar
Source4: MANIFEST.MF Source4: MANIFEST.MF
# Java API stubs for newer JDKs # Java API stubs for newer JDKs to allow us to build on the system default JDK
Source5: java10api.jar Source5: java14api.jar
# Always generate debug info when building RPMs (Andrew Haley) # Always generate debug info when building RPMs (Andrew Haley)
Patch0: %{name}-rpmdebuginfo.patch Patch0: %{name}-rpmdebuginfo.patch
@ -27,6 +27,10 @@ BuildArch: noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: javapackages-local BuildRequires: javapackages-local
# Build with Java 11 against bootclasspath of Java 8
BuildRequires: java-11-openjdk-devel
BuildRequires: java-1.8.0-openjdk-devel
%description %description
ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as
the JDT Core batch compiler. the JDT Core batch compiler.
@ -51,11 +55,11 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt
# Make Java API stubs available for other packages # Make Java API stubs available for other packages
%mvn_artifact "org.eclipse:java10api:jar:10" %{SOURCE5} %mvn_artifact "org.eclipse:java14api:jar:14" %{SOURCE5}
%mvn_alias "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9" %mvn_alias "org.eclipse:java14api:jar:14" "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9"
%build %build
ant -Djavaapi=%{SOURCE5} JAVA_HOME=%{_jvmdir}/java-11 ant -Djavaapi=%{SOURCE5}
%install %install
%mvn_artifact pom.xml ecj.jar %mvn_artifact pom.xml ecj.jar
@ -74,6 +78,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
%{_mandir}/man1/ecj* %{_mandir}/man1/ecj*
%changelog %changelog
* Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-1
- Update to latest upstream release
* Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 1:4.15-1 * Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 1:4.15-1
- Update to latest upstream release - Update to latest upstream release

View File

@ -1,3 +1,3 @@
SHA512 (ecjsrc-4.15.jar) = ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d SHA512 (ecjsrc-4.16.jar) = d835245bf5847ab0fb5412366e483a1951f8c4c7d415f5ee5a036ba4b44905e55b694551cef48511306173ed529f22c16af8c0a4cd560dd6742f08c5bf4d7959
SHA512 (ecj-3.21.0.pom) = d552dcf06f34a8e78fdb0464b20c6b98f84e0aff738220622d68d9ad9a702acecd5bba3f653a34120d82f9ea79e1131f6f100eb4afe68a8cec36fb2ed1828f76 SHA512 (ecj-3.22.0.pom) = a6585521f9a7368574764ce668f5d4d10db2589136d4cf640c6736ebde216c7efd1b83b1d29156a3e1effa47523482bb0aeabbc2597abc96459529ff13a31835
SHA512 (java10api.jar) = e4bf0c395560b9a95170c4e2b3726e93cb9dfff08175a686addd68b8cf3616b71d6782d1477778fe835b128df3634ea68874737e559c87248d4197282317bf8d SHA512 (java14api.jar) = 0026513d7783924261b45d575831b562c2b17ba704f38864b385a636a2c348d8746936234a88dc6e04d5560659ca621333909248be92f59ab7d787b7ce4982aa