rpm/ecj
SHA256
1
0
Fork 0
forked from pool/ecj
Code Pull Requests Activity

Accepting request 942804 from home:david.anes:branches:Java:packages

Browse Source 
Update to 4.22

OBS-URL: https://build.opensuse.org/request/show/942804
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=49
This commit is contained in:
Pedro Monreal Gonzalez 2021-12-27 17:30:08 +00:00 committed by Git OBS Bridge
parent 166f81f90a
commit 9d17fa82c8
6 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ecj-rpmdebuginfo.patch
View File

@ -1,13 +1,10 @@
### Eclipse Workspace Patch 1.0 ### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core #P org.eclipse.jdt.core
Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java Index: ecj-4.22/org/eclipse/jdt/internal/compiler/batch/Main.java
=================================================================== ===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v --- ecj-4.22.orig/org/eclipse/jdt/internal/compiler/batch/Main.java
retrieving revision 1.327 +++ ecj-4.22/org/eclipse/jdt/internal/compiler/batch/Main.java
diff -u -r1.327 Main.java @@ -3089,6 +3089,29 @@ public void configure(String[] argv) {
--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 21 Apr 2008 15:00:59 -0000 1.327
+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Nov 2008 19:26:57 -0000
@@ -2609,6 +2609,29 @@
this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED); this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
} }

5
ecj.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 27 16:18:33 UTC 2021 - David Anes <david.anes@suse.com>
- Upgrade to eclipse 4.22 ecj
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 18 21:28:05 UTC 2021 - Marcel Witte <wittemar@googlemail.com> Mon Oct 18 21:28:05 UTC 2021 - Marcel Witte <wittemar@googlemail.com>

11
ecj.spec
View File

@ -16,10 +16,10 @@
# #
%global qualifier R-4.18-202012021800 %global qualifier R-4.22-202111241800
%global jdk15_revision 1055f2102e6e %global jdk15_revision 1055f2102e6e
Name: ecj Name: ecj
Version: 4.18 Version: 4.22
Release: 0 Release: 0
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
License: EPL-2.0 AND GPL-2.0-only WITH Classpath-exception-2.0 License: EPL-2.0 AND GPL-2.0-only WITH Classpath-exception-2.0
@ -43,7 +43,7 @@ Patch0: %{name}-rpmdebuginfo.patch
# Include java API stubs in build with java < 15 # Include java API stubs in build with java < 15
Patch1: javaAPI.patch Patch1: javaAPI.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 10 BuildRequires: java-devel >= 11
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: unzip BuildRequires: unzip
BuildArch: noarch BuildArch: noarch
@ -56,10 +56,11 @@ the JDT Core batch compiler.
%setup -q -c -a 1 %setup -q -c -a 1
%patch0 -p1 %patch0 -p1
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1} %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
%patch1 %patch1 -p1
%endif %endif
sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml # debug is already present in new versions
# sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
mkdir -p scripts/binary/META-INF/ mkdir -p scripts/binary/META-INF/
cp %{SOURCE4} scripts/binary/META-INF/MANIFEST.MF cp %{SOURCE4} scripts/binary/META-INF/MANIFEST.MF

3
ecjsrc-4.18.jar
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed2419d5d449062cfd3e3ed48a471d292cb8993c8157a99ebc57b6cbcd3cc683
size 2248232

3
ecjsrc-4.22.jar Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b102a50cba74ad3a1491758892539f5ac3c0891eae4ea009a77427b8c5de8b74
size 2358194

14
javaAPI.patch
View File

@ -1,5 +1,7 @@
--- build.xml.orig 2020-09-02 22:05:12.000000000 +0200 Index: ecj-4.22/build.xml
+++ build.xml 2021-03-16 14:41:19.331235267 +0100 ===================================================================
--- ecj-4.22.orig/build.xml
+++ ecj-4.22/build.xml
@@ -18,16 +18,20 @@ @@ -18,16 +18,20 @@
<property name="output" value="bin" /> <property name="output" value="bin" />
<property name="jar_file" value="ecj.jar" /> <property name="jar_file" value="ecj.jar" />
@ -15,10 +17,10 @@
<javac srcdir="${basedir}" destdir="${output}" <javac srcdir="${basedir}" destdir="${output}"
+ encoding="utf-8" + encoding="utf-8"
debuglevel="lines,source" debuglevel="lines,source"
source="1.8" debug="true"
target="1.8"> release="11">
- <compilerarg line="-Xlint:none"/> - <compilerarg line="-Xlint:none --patch-module java.compiler=javax17api.jar"/>
+ <compilerarg line="-Xlint:none" value="-Xbootclasspath/p:${toString:build.path}"/> + <compilerarg line="-Xlint:none --patch-module java.compiler=${toString:build.path}"/>
</javac> </javac>
<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/> <delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>