diff --git a/.gitignore b/.gitignore index b19ba68..c37ccde 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ /java-runtime-decompiler-7.3.tar.gz /java-runtime-decompiler-8.0.tar.gz /java-runtime-decompiler-9.1.tar.gz -/java-runtime-decompiler-10.0.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index c8aaa6a..0000000 --- a/changelog +++ /dev/null @@ -1,148 +0,0 @@ -* Mon Jul 29 2024 Miroslav Suchý - 9.1-8 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 9.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed May 22 2024 Marian Koncek - 9.1-6 -- Add Requires on javapackages-tools - -* Tue Feb 27 2024 Jiri Vanek - 9.1-5 -- Rebuilt for java-21-openjdk as system jdk -- adjsuted the unhappy man ual java_home - -* Wed Jan 24 2024 Fedora Release Engineering - 9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 03 2024 Fedora Release Engineering - 9.1-1 -- update dto 9.1 -- https://github.com/judovana/java-runtime-decompiler/releases/tag/java-runtime-decompiler-9.1 -- https://github.com/judovana/java-runtime-decompiler/releases/tag/java-runtime-decompiler-9.0 - -* Fri Oct 13 2023 Fedora Release Engineering - 8.0-1 -- update dto 8.0 -- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-8.0 - -* Thu Jul 20 2023 Fedora Release Engineering - 7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Fedora Release Engineering - 7.3-2 -- added 2b99a244b592445962cdd15ca33f80449f9aa2ea.patch to fix compiler issue in jrd window - -* Fri Jun 30 2023 Fedora Release Engineering - 7.3-1 -- moved to 7.3 -- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.3 -- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.2 - -* Wed Mar 15 2023 Fedora Release Engineering - 7.1-1 -- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.1 -- moved to jrd 7.1 -- added desp on java-diff and new cplc -- fixed(?) procyon wrapper - - todo procyon crashes witout trace -- removed jd wrapper (was new in 7.1, maybe will be added) -- split plugins to subpkgs -- added jrd-hex launcher -- added hex launcher, added jrd symlinks - -* Thu Jul 21 2022 Fedora Release Engineering - 6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 6.1-4 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 6.1-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sun Dec 26 2021 Fedora Release Engineering - 6.0.0.pre.3-1 -- bumped sources to upstream rc candidate - -* Sun Dec 26 2021 Fedora Release Engineering - 6.0.0.pre.2-1 -- bumped sources to upstream pre release - -* Thu Aug 12 2021 Fedora Release Engineering - 6.0.0.pre.1-1 -- umped sources to upstream pre release -- adapted jcoder plugin -- todo, patch for removed plugins - -* Thu Aug 12 2021 Fedora Release Engineering - 5.1-1 -- bumped to final sources - -* Mon Aug 09 2021 Fedora Release Engineering - 5.0.rc1-1 -- adapted manpage - -* Mon Aug 02 2021 Fedora Release Engineering - 5.0.beta2-1 -- updated to 5.0 -- removed jdk8 subpkg due to compiler api -- added Cfr and asmtools plugins -- todo man page - -* Thu Jul 22 2021 Fedora Release Engineering - 4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 08 2020 Jiri Vanek - 4.0-2 -- Added subpackage built by jdk8 to allow looking into jdk8 apps -- for some reason, jdk8 vm can not look into jdk11 vm, even if agent is correctly jdk8 version -- the config is still share, which is stupid, but I doubt there is another target audeince then me - -* Tue Dec 08 2020 Jiri Vanek - 4.0-1 -- built by jdk11 - -* Tue Jul 28 2020 Fedora Release Engineering - 3.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 3.0-8 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Mar 17 2020 Jiri Vanek - 3.0-7 -- aligned rsyntaxtextarea version, fixed javadoc generation - -* Tue Mar 17 2020 Jiri Vanek - 3.0-6 -- changed jdk8 requirement - -* Wed Jan 29 2020 Fedora Release Engineering - 3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 27 2019 Jiri Vanek - 3.0-3 -- all stdouts from customlauncher moved to stderr - -* Mon Aug 26 2019 Jiri Vanek - 3.0-0 -- moved to usptream version 3.0 -- adjusted configs, removed lambda patch - -* Thu Jul 25 2019 Fedora Release Engineering - 2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 17 2019 Jiri Vanek - 2.0-5 -- improved Patch3, includeLambdas.patch to sort the lamdas t the bottom - -* Thu Jan 17 2019 Jiri Vanek - 2.0-4 -- added depndence of procyon decompiler (currenlty under review -- added and applied Patch2, systemProcyon.patch to enable system procyon out of thebox -- added and applied Patch3, includeLambdas.patch to at least list lamdas untill fixed in upstream - -* Thu Jan 10 2019 Jiri Vanek - 2.0-3 -- added depndence of fernflower decompiler -- added and applied Patch1, systemFernflower.patch to enable system fernflower - -* Wed Nov 28 2018 Petra Mikova - 2.0-2 -- fixed changelog - -* Mon Nov 19 2018 Petra Mikova - 2.0-1 -- fixed issues listed in review (rhbz#1636019) -- added installation of desktop file - -* Wed Jun 06 2018 Petra Mikova - 1.1-1 -- initial commit diff --git a/java-runtime-decompiler.spec b/java-runtime-decompiler.spec index 8ef55d9..225a850 100644 --- a/java-runtime-decompiler.spec +++ b/java-runtime-decompiler.spec @@ -1,8 +1,8 @@ Summary: Application for extraction and decompilation of JVM byte code Name: java-runtime-decompiler -Version: 10.0 -Release: 7%{?dist} -License: GPL-3.0-only +Version: 9.1 +Release: 1%{?dist} +License: GPLv3 URL: https://github.com/pmikova/java-runtime-decompiler Source0: https://github.com/judovana/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name} @@ -21,37 +21,37 @@ Patch6: systemJcoder.patch Patch61: systemJcoder7.patch Patch62: systemJcoderG.patch Patch63: systemJcoderG7.patch -Patch7: systemJd.patch +Patch7: removeMultilineSpotbugs.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local-openjdk25 +BuildRequires: maven-local BuildRequires: byteman BuildRequires: rsyntaxtextarea BuildRequires: junit5 BuildRequires: ant-junit5 +BuildRequires: junit +BuildRequires: ant-junit BuildRequires: java-diff-utils BuildRequires: maven-surefire-provider-junit BuildRequires: maven-surefire-provider-junit5 BuildRequires: maven-surefire BuildRequires: maven-surefire-plugin BuildRequires: maven-clean-plugin -BuildRequires: java-25-devel +BuildRequires: java-devel BuildRequires: google-gson BuildRequires: desktop-file-utils BuildRequires: classpathless-compiler -BuildRequires: jurand Requires: google-gson Requires: byteman Requires: rsyntaxtextarea -Requires: javapackages-tools +Requires: java-headless Requires: classpathless-compiler Requires: java-diff-utils Recommends: java Recommends: %{name}-fernflower-plugin Recommends: %{name}-procyon-plugin Recommends: %{name}-cfr-plugin -Recommends: %{name}-jd-plugin Recommends: %{name}-asmtools-plugin Recommends: %{name}-asmtools7-plugin @@ -91,14 +91,6 @@ Requires: %{name} = %{version}-%{release} %description cfr-plugin This package provides bindings and requirements to CFR decompiler for %{name}. -%package jd-plugin -Requires: jd-core -Summary: JD decompiler %{name} -Requires: %{name} = %{version}-%{release} - -%description jd-plugin -This package provides bindings and requirements to JD decompiler for %{name}. - %package asmtools-plugin Requires: openjdk-asmtools >= 8.0.b09 Summary: asmtools disassembler and assembler plugin for %{name} @@ -117,22 +109,20 @@ This package provides bindings and requirements to asmtools7 disassembler and as %prep %setup -q -n %{name}-%{name}-%{version} -%patch -P1 -p0 -%patch -P2 -p0 -%patch -P21 -p0 -%patch -P3 -p0 -%patch -P4 -p0 -%patch -P5 -p0 -%patch -P51 -p0 -%patch -P52 -p0 -%patch -P53 -p0 -%patch -P6 -p0 -%patch -P61 -p0 -%patch -P62 -p0 -%patch -P63 -p0 -%patch -P7 -p0 - -jurand -i -s -a -n SuppressFBWarnings decompiler_agent runtime-decompiler +%patch1 -p0 +%patch2 -p0 +%patch21 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch51 -p0 +%patch52 -p0 +%patch53 -p0 +%patch6 -p0 +%patch61 -p0 +%patch62 -p0 +%patch63 -p0 +%patch7 -p1 %build pushd runtime-decompiler @@ -142,7 +132,14 @@ popd %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :formatter-maven-plugin %pom_remove_dep :spotbugs-annotations +a=`find | grep ".*\.java$"` +for x in $a ; do + #grep -e ".*SuppressFBWarnings.*" $x && echo "^ $x ^" + sed "s/.*SuppressFBWarnings.*//g" $x -i +done xmvn --version +echo $JAVA_HOME +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk #why? xmvn --version %mvn_build -f --xmvn-javadoc -- -Plegacy CPLC=/usr/share/java/classpathless-compiler @@ -174,6 +171,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3} desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4} +#jd is not yet packed and sucks anyway +rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.java +rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.json + %files -f .mfiles %attr(755, root, -) %{_bindir}/java-runtime-decompiler %attr(755, root, -) %{_bindir}/java-runtime-decompiler-hex @@ -202,10 +203,6 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic %config %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.java %config(noreplace) %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.json -%files jd-plugin -%config %{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.java -%config(noreplace) %{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.json - %files asmtools-plugin %config %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.java %config(noreplace) %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.json @@ -231,4 +228,132 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic %license LICENSE %changelog -%autochangelog +* Wed Jan 03 2024 Fedora Release Engineering - 9.1-1 +- update dto 9.1 +- https://github.com/judovana/java-runtime-decompiler/releases/tag/java-runtime-decompiler-9.1 +- https://github.com/judovana/java-runtime-decompiler/releases/tag/java-runtime-decompiler-9.0 + +* Fri Oct 13 2023 Fedora Release Engineering - 8.0-1 +- update dto 8.0 +- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-8.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Fedora Release Engineering - 7.3-2 +- added 2b99a244b592445962cdd15ca33f80449f9aa2ea.patch to fix compiler issue in jrd window + +* Fri Jun 30 2023 Fedora Release Engineering - 7.3-1 +- moved to 7.3 +- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.3 +- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.2 + +* Wed Mar 15 2023 Fedora Release Engineering - 7.1-1 +- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.1 +- moved to jrd 7.1 +- added desp on java-diff and new cplc +- fixed(?) procyon wrapper + - todo procyon crashes witout trace +- removed jd wrapper (was new in 7.1, maybe will be added) +- split plugins to subpkgs +- added jrd-hex launcher +- added hex launcher, added jrd symlinks + +* Thu Jul 21 2022 Fedora Release Engineering - 6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 6.1-4 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 6.1-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Dec 26 2021 Fedora Release Engineering - 6.0.0.pre.3-1 +- bumped sources to upstream rc candidate + +* Sun Dec 26 2021 Fedora Release Engineering - 6.0.0.pre.2-1 +- bumped sources to upstream pre release + +* Thu Aug 12 2021 Fedora Release Engineering - 6.0.0.pre.1-1 +- umped sources to upstream pre release +- adapted jcoder plugin +- todo, patch for removed plugins + +* Thu Aug 12 2021 Fedora Release Engineering - 5.1-1 +- bumped to final sources + +* Mon Aug 09 2021 Fedora Release Engineering - 5.0.rc1-1 +- adapted manpage + +* Mon Aug 02 2021 Fedora Release Engineering - 5.0.beta2-1 +- updated to 5.0 +- removed jdk8 subpkg due to compiler api +- added Cfr and asmtools plugins +- todo man page + +* Thu Jul 22 2021 Fedora Release Engineering - 4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 08 2020 Jiri Vanek - 4.0-2 +- Added subpackage built by jdk8 to allow looking into jdk8 apps +- for some reason, jdk8 vm can not look into jdk11 vm, even if agent is correctly jdk8 version +- the config is still share, which is stupid, but I doubt there is another target audeince then me + +* Tue Dec 08 2020 Jiri Vanek - 4.0-1 +- built by jdk11 + +* Tue Jul 28 2020 Fedora Release Engineering - 3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.0-8 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Mar 17 2020 Jiri Vanek - 3.0-7 +- aligned rsyntaxtextarea version, fixed javadoc generation + +* Tue Mar 17 2020 Jiri Vanek - 3.0-6 +- changed jdk8 requirement + +* Wed Jan 29 2020 Fedora Release Engineering - 3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Aug 27 2019 Jiri Vanek - 3.0-3 +- all stdouts from customlauncher moved to stderr + +* Mon Aug 26 2019 Jiri Vanek - 3.0-0 +- moved to usptream version 3.0 +- adjusted configs, removed lambda patch + +* Thu Jul 25 2019 Fedora Release Engineering - 2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 17 2019 Jiri Vanek - 2.0-5 +- improved Patch3, includeLambdas.patch to sort the lamdas t the bottom + +* Thu Jan 17 2019 Jiri Vanek - 2.0-4 +- added depndence of procyon decompiler (currenlty under review +- added and applied Patch2, systemProcyon.patch to enable system procyon out of thebox +- added and applied Patch3, includeLambdas.patch to at least list lamdas untill fixed in upstream + +* Thu Jan 10 2019 Jiri Vanek - 2.0-3 +- added depndence of fernflower decompiler +- added and applied Patch1, systemFernflower.patch to enable system fernflower + +* Wed Nov 28 2018 Petra Mikova - 2.0-2 +- fixed changelog + +* Mon Nov 19 2018 Petra Mikova - 2.0-1 +- fixed issues listed in review (rhbz#1636019) +- added installation of desktop file + +* Wed Jun 06 2018 Petra Mikova - 1.1-1 +- initial commit diff --git a/removeMultilineSpotbugs.patch b/removeMultilineSpotbugs.patch new file mode 100644 index 0000000..f8ddbb9 --- /dev/null +++ b/removeMultilineSpotbugs.patch @@ -0,0 +1,65 @@ +--- a/runtime-decompiler/src/main/java/org/jrd/backend/core/DecompilerRequestReceiver.java ++++ a/runtime-decompiler/src/main/java/org/jrd/backend/core/XDecompilerRequestReceiver.java +@@ -262,10 +262,6 @@ + private static class ClassesComparator implements Comparator, Serializable { + + @SuppressWarnings({"ReturnCount", "CyclomaticComplexity"}) // comparator syntax +- @SuppressFBWarnings( +- value = "NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE", +- justification = "False report of possible NP dereference, despite testing both o1 & o2 for nullness." +- ) + @Override + public int compare(ClassInfo c1, ClassInfo c2) { + if (c1 == null && c2 == null) { +--- a/runtime-decompiler/src/main/java/org/jrd/backend/data/VmInfo.java ++++ a/runtime-decompiler/src/main/java/org/jrd/backend/data/XVmInfo.java +@@ -112,10 +112,6 @@ + this.type = local; + } + +- @SuppressFBWarnings( +- value = "NP_LOAD_OF_KNOWN_NULL_VALUE", +- justification = "Classpath is only used for FS VMs, in other cases getCp() does not get called" +- ) + public void setCp(List cp) { + if (cp == null) { + this.cp = null; +--- a/runtime-decompiler/src/test/java/org/jrd/frontend/frame/plugins/FileSelectorArrayRowTest.java ++++ a/runtime-decompiler/src/test/java/org/jrd/frontend/frame/plugins/XFileSelectorArrayRowTest.java +@@ -11,9 +11,6 @@ + import java.io.File; + import java.nio.file.Paths; + +-@SuppressFBWarnings( +- value = "DMI_HARDCODED_ABSOLUTE_FILENAME", justification = "Hardcoded paths aren't used for manipulating with an actual filesystem." +-) + class FileSelectorArrayRowTest { + @BeforeAll + static void setup() { +--- a/runtime-decompiler/src/main/java/org/jrd/backend/data/cli/utils/CompileArguments.java ++++ a/runtime-decompiler/src/main/java/org/jrd/backend/data/cli/utils/CompileArguments.java +@@ -77,10 +77,6 @@ + return new RuntimeCompilerConnector.JrdClassesProvider(localVmInfo, vmManager); + } + +- @SuppressFBWarnings( +- value = "NP_LOAD_OF_KNOWN_NULL_VALUE", +- justification = "Classpath is only used for FS VMs, in other cases getCp() does not get called" +- ) + /** + * Warning, possibly unused, rotten code. + */ +--- a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java ++++ a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java +@@ -103,10 +103,6 @@ + //currently standalone dialog supports only additions + //and additions do not support classlaoder selection (obviously) + //the classlaoder now remain thus unused +- @SuppressFBWarnings( +- value = "SS_SHOULD_BE_STATIC", +- justification = "is really per instance, however will ahve sense, only if standalone dialog will support overwrite, which is unlikely" +- ) + private final boolean overvriteEnabled = false; + //field to hots the target classlaoder if it willbe ever supported + //it is now null, what is waht the only ussage in compiler.compile(toCompile, pluginManager, classloader); needs + diff --git a/rsyntaxVersion.patch b/rsyntaxVersion.patch index c423a28..cf084ca 100644 --- a/rsyntaxVersion.patch +++ b/rsyntaxVersion.patch @@ -4,8 +4,8 @@ com.fifesoft rsyntaxtextarea -- 3.6.0 -+ 3.6.0 +- 3.1.2 ++ 3.1.1 org.jboss.byteman diff --git a/sources b/sources index 1ab8d67..639b6d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (java-runtime-decompiler-10.0.tar.gz) = b3e3b98e5d9fbb367e43df32a10e9cbed2cfd696109b14f4360f49ddf81eda5214fa425327407392642544602a5699c1b9221a33da9f0e1b0ccd3384b4aa6ead +SHA512 (java-runtime-decompiler-9.1.tar.gz) = 9373d08d9482614561726ab82b3f116136c79bf9758950276cf3043c6443425c17b43699d19cd33eb0761e3819795249a304135d64185989dcc1eeb59a9c671d diff --git a/systemCfr.patch b/systemCfr.patch index ed64dc4..2a0a77d 100644 --- a/systemCfr.patch +++ b/systemCfr.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/CfrDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/CfrDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/benf/cfr/0.152/cfr-0.152.jar" +- "file://${HOME}/.m2/repository/org/benf/cfr/0.151/cfr-0.151.jar" + "file:/usr/share/java/CFR/cfr.jar" ], "DecompilerDownloadURL": "https://www.benf.org/other/cfr/faq.html" diff --git a/systemFernflower.patch b/systemFernflower.patch index 746c176..b179e10 100644 --- a/systemFernflower.patch +++ b/systemFernflower.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/FernflowerDecompilerWrapper.java", + "WrapperURL": "file:///etc/java-runtime-decompiler/plugins/FernflowerDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/jboss/windup/decompiler/decompiler-fernflower/6.3.9.Final/decompiler-fernflower-6.3.9.Final.jar", +- "file://${HOME}/.m2/repository/org/jboss/windup/decompiler/decompiler-fernflower/5.1.4.Final/decompiler-fernflower-5.1.4.Final.jar", - "file://${HOME}/.m2/repository/org/jboss/windup/decompiler/fernflower/windup-fernflower/1.0.0.20171018/windup-fernflower-1.0.0.20171018.jar" + "file:///usr/share/java/fernflower.jar" ], diff --git a/systemJasm.patch b/systemJasm.patch index 33c2f1d..dc2991d 100644 --- a/systemJasm.patch +++ b/systemJasm.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JasmDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JasmDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/9.0.b12-ea/asmtools-9.0.b12-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJasmG.patch b/systemJasmG.patch index 2844626..81b6665 100644 --- a/systemJasmG.patch +++ b/systemJasmG.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JasmGDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JasmGDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/9.0.b12-ea/asmtools-9.0.b12-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJcoder.patch b/systemJcoder.patch index 086e3ac..bd2690a 100644 --- a/systemJcoder.patch +++ b/systemJcoder.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JcoderDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JcoderDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/9.0.b12-ea/asmtools-9.0.b12-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJcoderG.patch b/systemJcoderG.patch index 61fb2eb..4e07a9c 100644 --- a/systemJcoderG.patch +++ b/systemJcoderG.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JcoderGDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JcoderGDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/9.0.b12-ea/asmtools-9.0.b12-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJd.patch b/systemJd.patch deleted file mode 100644 index 5228d21..0000000 --- a/systemJd.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- runtime-decompiler/src/plugins/JdDecompilerWrapper.json -+++ runtime-decompiler/src/plugins/JdDecompilerWrapper.json -@@ -1,8 +1,8 @@ - { - "Name": "JD", -- "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JdDecompilerWrapper.java", -+ "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JdDecompilerWrapper.java", - "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/jd/jd-core/1.1.3/jd-core-1.1.3.jar" -+ "file:///usr/share/java/jd-core/jd-core.jar" - ], - "DecompilerDownloadURL": "https://github.com/java-decompiler/jd-core/" - } - diff --git a/systemProcyon.patch b/systemProcyon.patch index 5870794..4886e80 100644 --- a/systemProcyon.patch +++ b/systemProcyon.patch @@ -8,13 +8,13 @@ - "file://${HOME}/.m2/repository/com/github/mstrobel/procyon-core/1.0-SNAPSHOT/procyon-core-1.0-SNAPSHOT.jar", - "file://${HOME}/.m2/repository/com/github/mstrobel/procyon-compilertools/1.0-SNAPSHOT/procyon-compilertools-1.0-SNAPSHOT.jar", - "file://${HOME}/.m2/repository/com/github/mstrobel/procyon-decompiler/1.0-SNAPSHOT/procyon-decompiler-1.0-SNAPSHOT.jar", -- "file://${HOME}/.m2/repository/com/beust/jcommander/1.82/jcommander-1.82.jar" +- "file://${HOME}/.m2/repository/com/beust/jcommander/1.78/jcommander-1.78.jar" + "/usr/share/java/procyon/procyon-core.jar", + "/usr/share/java/procyon/procyon-compilertools.jar", + "/usr/share/java/procyon/procyon-decompiler.jar", + "/usr/share/java/beust-jcommander.jar" ], - "DecompilerDownloadURL": "https://github.com/mstrobel/procyon/" + "DecompilerDownloadURL": "https://github.com/mstrobel/procyon/git " } diff --git a/systemProcyonAssembler.patch b/systemProcyonAssembler.patch index 10a690b..d385b99 100644 --- a/systemProcyonAssembler.patch +++ b/systemProcyonAssembler.patch @@ -8,13 +8,13 @@ - "file://${HOME}/.m2/repository/com/github/mstrobel/procyon-core/1.0-SNAPSHOT/procyon-core-1.0-SNAPSHOT.jar", - "file://${HOME}/.m2/repository/com/github/mstrobel/procyon-compilertools/1.0-SNAPSHOT/procyon-compilertools-1.0-SNAPSHOT.jar", - "file://${HOME}/.m2/repository/com/github/mstrobel/procyon-decompiler/1.0-SNAPSHOT/procyon-decompiler-1.0-SNAPSHOT.jar", -- "file://${HOME}/.m2/repository/com/beust/jcommander/1.82/jcommander-1.82.jar" +- "file://${HOME}/.m2/repository/com/beust/jcommander/1.78/jcommander-1.78.jar" + "/usr/share/java/procyon/procyon-core.jar", + "/usr/share/java/procyon/procyon-compilertools.jar", + "/usr/share/java/procyon/procyon-decompiler.jar", + "/usr/share/java/beust-jcommander.jar" ], - "DecompilerDownloadURL": "https://github.com/mstrobel/procyon/" + "DecompilerDownloadURL": "https://github.com/mstrobel/procyon/git " }