downgrade to 4.12
This commit is contained in:
parent
36cadf41c9
commit
e9aa817f97
15
MANIFEST.MF
15
MANIFEST.MF
@ -1,10 +1,5 @@
|
|||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch
|
Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch
|
||||||
Archiver-Version: Plexus Archiver
|
|
||||||
Built-By: genie.releng
|
|
||||||
Bundle-ManifestVersion: 2
|
|
||||||
Bundle-Vendor: Eclipse.org
|
|
||||||
Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
|
|
||||||
Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
|
Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
|
||||||
.eclipse.jdt.internal.antadapter;x-internal:=true,org.eclipse.jdt.int
|
.eclipse.jdt.internal.antadapter;x-internal:=true,org.eclipse.jdt.int
|
||||||
ernal.compiler;x-internal:=true,org.eclipse.jdt.internal.compiler.apt
|
ernal.compiler;x-internal:=true,org.eclipse.jdt.internal.compiler.apt
|
||||||
@ -23,8 +18,12 @@ 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.13.0.v20170516-1929
|
Bundle-Version: 3.18.0.v20190522-0428
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Created-By: Apache Maven
|
Built-By: genie.releng
|
||||||
Build-Jdk: 1.8.0_121
|
Bundle-ManifestVersion: 2
|
||||||
|
Bundle-Vendor: Eclipse.org
|
||||||
|
Created-By: Apache Maven 3.5.4
|
||||||
|
Build-Jdk: 1.8.0_192
|
||||||
|
Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.jdt</groupId>
|
<groupId>org.eclipse.jdt</groupId>
|
||||||
<artifactId>ecj</artifactId>
|
<artifactId>ecj</artifactId>
|
||||||
<version>3.29.0</version>
|
<version>3.18.0</version>
|
||||||
<description>Eclipse Compiler for Java(TM)</description>
|
<description>Eclipse Compiler for Java(TM)</description>
|
||||||
<name>Eclipse Compiler for Java(TM)</name>
|
<name>Eclipse Compiler for Java(TM)</name>
|
||||||
<url>http://www.eclipse.org/jdt</url>
|
<url>http://www.eclipse.org/jdt</url>
|
||||||
@ -36,7 +36,7 @@
|
|||||||
<url>https://bugs.eclipse.org/</url>
|
<url>https://bugs.eclipse.org/</url>
|
||||||
</issueManagement>
|
</issueManagement>
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:https://git.eclipse.org/r/jdt/eclipse.jdt.core.git</connection>
|
<connection>scm:git:git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git</connection>
|
||||||
<url>https://git.eclipse.org/c/jdt/eclipse.jdt.core.git</url>
|
<url>https://git.eclipse.org/c/jdt/eclipse.jdt.core.git</url>
|
||||||
</scm>
|
</scm>
|
||||||
<developers>
|
<developers>
|
||||||
@ -1,18 +1,13 @@
|
|||||||
From e7ff390ef777bd818ccc6e6f8f3a56f36020abfe Mon Sep 17 00:00:00 2001
|
### Eclipse Workspace Patch 1.0
|
||||||
From: Mat Booth <mat.booth@gmail.com>
|
#P org.eclipse.jdt.core
|
||||||
Date: Wed, 15 Sep 2021 10:21:53 +0100
|
Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
|
||||||
Subject: [PATCH 1/2] Always generate bytecode debuginfo
|
===================================================================
|
||||||
|
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
|
||||||
When ecj is used to build RPMs
|
retrieving revision 1.327
|
||||||
---
|
diff -u -r1.327 Main.java
|
||||||
.../jdt/internal/compiler/batch/Main.java | 23 +++++++++++++++++++
|
--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 21 Apr 2008 15:00:59 -0000 1.327
|
||||||
1 file changed, 23 insertions(+)
|
+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Nov 2008 19:26:57 -0000
|
||||||
|
@@ -2609,6 +2609,29 @@
|
||||||
diff --git a/org/eclipse/jdt/internal/compiler/batch/Main.java b/org/eclipse/jdt/internal/compiler/batch/Main.java
|
|
||||||
index f77372d..73a0d24 100644
|
|
||||||
--- a/org/eclipse/jdt/internal/compiler/batch/Main.java
|
|
||||||
+++ b/org/eclipse/jdt/internal/compiler/batch/Main.java
|
|
||||||
@@ -3109,6 +3109,29 @@ public void configure(String[] argv) {
|
|
||||||
this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
|
this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,6 +37,3 @@ index f77372d..73a0d24 100644
|
|||||||
this.logger.logCommandLineArguments(newCommandLineArgs);
|
this.logger.logCommandLineArguments(newCommandLineArgs);
|
||||||
this.logger.logOptions(this.options);
|
this.logger.logOptions(this.options);
|
||||||
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
27
ecj.spec
27
ecj.spec
@ -1,23 +1,24 @@
|
|||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
%global bundle_ver 3.29.0
|
%global qualifier R-4.12-201906051800
|
||||||
|
|
||||||
Name: ecj
|
Name: ecj
|
||||||
Version: 4.23
|
Version: 4.12
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: the Eclipse Compiler for Java
|
Summary: the Eclipse Compiler for Java
|
||||||
License: EPL-2.0
|
License: EPL-2.0
|
||||||
URL: http://www.eclipse.org
|
URL: http://www.eclipse.org
|
||||||
|
|
||||||
Source0: https://download.eclipse.org/eclipse/downloads/drops4/R-%{version}-202203080310/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/%{bundle_ver}/ecj-%{bundle_ver}.pom
|
Source1: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.18.0/ecj-3.18.0.pom
|
||||||
Source2: MANIFEST.MF
|
Source2: MANIFEST.MF
|
||||||
|
Source3: java10api.jar
|
||||||
|
|
||||||
Patch0: 0001-Always-generate-bytecode-debuginfo.patch
|
Patch0: %{name}-rpmdebuginfo.patch
|
||||||
|
Patch1: javaAPI.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: ant javapackages-local
|
BuildRequires: ant javapackages-local
|
||||||
BuildRequires: java-11-openjdk-devel
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
ECJ is the the Eclipse Compiler for Java. It is also known as the JDT Core batch compiler.
|
ECJ is the the Eclipse Compiler for Java. It is also known as the JDT Core batch compiler.
|
||||||
@ -27,18 +28,21 @@ ECJ is the the Eclipse Compiler for Java. It is also known as the JDT Core batc
|
|||||||
%prep
|
%prep
|
||||||
%autosetup -c -n %{name}-%{version} -p1
|
%autosetup -c -n %{name}-%{version} -p1
|
||||||
|
|
||||||
sed -i -e "s/Xlint:none/Xlint:none -encoding cp1252/g" build.xml
|
sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml
|
||||||
rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
|
|
||||||
cp %{SOURCE1} pom.xml
|
cp %{SOURCE1} pom.xml
|
||||||
mkdir -p scripts/binary/META-INF/
|
mkdir -p scripts/binary/META-INF/
|
||||||
cp %{SOURCE2} scripts/binary/META-INF/MANIFEST.MF
|
cp %{SOURCE2} scripts/binary/META-INF/MANIFEST.MF
|
||||||
|
|
||||||
|
rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
|
||||||
|
|
||||||
%mvn_alias org.eclipse.jdt:ecj org.eclipse.jdt:core org.eclipse.jdt.core.compiler:ecj \
|
%mvn_alias org.eclipse.jdt:ecj org.eclipse.jdt:core org.eclipse.jdt.core.compiler:ecj \
|
||||||
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
|
||||||
|
%mvn_artifact "org.eclipse:java10api:jar:10" %{SOURCE3}
|
||||||
|
%mvn_alias "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9"
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export JAVA_HOME=/usr/lib/jvm/java-11
|
ant -Djavaapi=%{SOURCE3}
|
||||||
ant
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_artifact pom.xml ecj.jar
|
%mvn_artifact pom.xml ecj.jar
|
||||||
@ -58,6 +62,9 @@ install -m 644 -p ecj.1 %{buildroot}%{_mandir}/man1/ecj.1
|
|||||||
%{_mandir}/man1/ecj*
|
%{_mandir}/man1/ecj*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 23 2022 chenchen <chen_aka_jan@163.com> - 1:4.12-1
|
||||||
|
- downgrade to 4.12
|
||||||
|
|
||||||
* Wed May 18 2022 chenchen <chen_aka_jan@163.com> - 1:4.23-1
|
* Wed May 18 2022 chenchen <chen_aka_jan@163.com> - 1:4.23-1
|
||||||
- update to 4.23
|
- update to 4.23
|
||||||
|
|
||||||
|
|||||||
BIN
ecjsrc-4.12.jar
Normal file
BIN
ecjsrc-4.12.jar
Normal file
Binary file not shown.
BIN
ecjsrc-4.23.jar
BIN
ecjsrc-4.23.jar
Binary file not shown.
BIN
java10api.jar
Normal file
BIN
java10api.jar
Normal file
Binary file not shown.
26
javaAPI.patch
Normal file
26
javaAPI.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
--- a/build.xml.orig 2018-03-20 15:15:57.063810672 +0000
|
||||||
|
+++ b/build.xml 2018-03-20 15:16:26.018700633 +0000
|
||||||
|
@@ -15,16 +15,20 @@
|
||||||
|
<property name="output" value="bin" />
|
||||||
|
<property name="jar_file" value="ecj.jar" />
|
||||||
|
|
||||||
|
+ <path id="build.path">
|
||||||
|
+ <pathelement path="${javaapi}"/>
|
||||||
|
+ <pathelement path="/usr/lib/jvm/java-1.8.0/jre/lib/rt.jar"/>
|
||||||
|
+ </path>
|
||||||
|
<target name="build">
|
||||||
|
<delete file="${basedir}/${jar_file}" failonerror="no" />
|
||||||
|
<delete dir="${output}" failonerror="no" />
|
||||||
|
<mkdir dir="${output}" />
|
||||||
|
|
||||||
|
- <javac srcdir="${basedir}" destdir="${output}"
|
||||||
|
- debuglevel="lines,source"
|
||||||
|
+ <javac srcdir="${basedir}" destdir="${output}" bootclasspathref="build.path"
|
||||||
|
+ debug="yes"
|
||||||
|
source="1.8"
|
||||||
|
target="1.8">
|
||||||
|
- <compilerarg line="-Xlint:none"/>
|
||||||
|
+ <compilerarg line="-Xlint:none -encoding cp1252"/>
|
||||||
|
</javac>
|
||||||
|
|
||||||
|
<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>
|
||||||
Loading…
x
Reference in New Issue
Block a user