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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=52

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-20 14:17:51 +00:00 committed by Git OBS Bridge
parent 5cccfe21b6
commit 9169ccdcb1
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecj.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Mar 20 13:35:05 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* encoding.patch
+ the encoding needs to be set for all JDK versions
- Modified patch:
* javaAPI.patch
+ extract the encoding part to a separate patch
------------------------------------------------------------------- -------------------------------------------------------------------
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>

10
ecj.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ecj # spec file for package ecj
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -40,8 +40,9 @@ Source3: java15api.pom
Source4: MANIFEST.MF Source4: MANIFEST.MF
# Always generate debug info when building RPMs # Always generate debug info when building RPMs
Patch0: %{name}-rpmdebuginfo.patch Patch0: %{name}-rpmdebuginfo.patch
Patch1: encoding.patch
# Include java API stubs in build with java < 15 # Include java API stubs in build with java < 15
Patch1: javaAPI.patch Patch2: javaAPI.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 10 BuildRequires: java-devel >= 10
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -55,8 +56,9 @@ the JDT Core batch compiler.
%prep %prep
%setup -q -c -a 1 %setup -q -c -a 1
%patch0 -p1 %patch0 -p1
%patch1 -p1
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1} %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
%patch1 %patch2
%endif %endif
sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
@ -79,7 +81,7 @@ jar -cf java15api.jar -C build/classes .
# Remove everything except the jar, since ant looks for java files in "." # Remove everything except the jar, since ant looks for java files in "."
rm -rf java15api-src build/classes rm -rf java15api-src build/classes
ant \ %ant \
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1} %if %{?pkg_vcmp:%pkg_vcmp java-devel < 15}%{!?pkg_vcmp:1}
-Djavaapi=java15api.jar \ -Djavaapi=java15api.jar \
%endif %endif

10
encoding.patch Normal file
View File

@ -0,0 +1,10 @@
--- ecj-4.18.orig/build.xml 2022-03-20 14:23:39.947886348 +0100
+++ ecj-4.18/build.xml 2022-03-20 14:26:28.600913037 +0100
@@ -27,6 +27,7 @@
<mkdir dir="${output}" />
<javac srcdir="${basedir}" destdir="${output}"
+ encoding="utf-8"
debuglevel="lines,source"
source="1.8"
target="1.8">

4
javaAPI.patch
View File

@ -1,6 +1,6 @@
--- build.xml.orig 2020-09-02 22:05:12.000000000 +0200 --- build.xml.orig 2020-09-02 22:05:12.000000000 +0200
+++ build.xml 2021-03-16 14:41:19.331235267 +0100 +++ build.xml 2021-03-16 14:41:19.331235267 +0100
@@ -18,16 +18,20 @@ @@ -18,17 +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" />
@ -13,7 +13,7 @@
<mkdir dir="${output}" /> <mkdir dir="${output}" />
<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" source="1.8"
target="1.8"> target="1.8">