Fridrich Strba 2019-09-25 13:35:26 +00:00 committed by Git OBS Bridge
parent 8331dd1899
commit d66d750125
4 changed files with 30 additions and 29 deletions

View File

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

View File

@ -22,12 +22,13 @@ Name: ecj
Version: 4.12
Release: 0
Summary: Eclipse Compiler for Java
License: EPL-2.0
License: EPL-2.0 AND GPL-2.0-only AND AND GPL-2.0-only WITH Classpath-exception-2.0
Group: Development/Libraries/Java
URL: https://www.eclipse.org
Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar
# Jdk10 sources to build Java API stubs for newer JDKs
Source1: http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/%{jdk10_revision}.tar.bz2
# Source1: http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/%{jdk10_revision}.tar.bz2
Source1: java10api-src.tar.xz
Source2: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.18.0/ecj-3.18.0.pom
# Simple pom file to declare org.eclipse:java10api artifact
Source3: java10api.pom
@ -71,17 +72,17 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
# Not compatible with non-modular Java
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 9}%{!?pkg_vcmp:1}
rm -f jdk10u-%{jdk10_revision}/src/java.compiler/share/classes/javax/tools/ToolProvider.java
rm -f java10api/javax/tools/ToolProvider.java
%endif
%build
mkdir -p build/classes
javac -d build/classes -source 8 -target 8 \
$(find jdk10u-%{jdk10_revision}/src/java.compiler/share/classes/javax -name \*.java | xargs)
$(find java10api/javax -name \*.java | xargs)
jar -cf java10api.jar -C build/classes .
# Remove everything except the jar, since ant looks for java files in "."
rm -rf jdk10u-%{jdk10_revision} build/classes
rm -rf java10api build/classes
ant \
%if %{?pkg_vcmp:%pkg_vcmp java-devel < 9}%{!?pkg_vcmp:1}

3
java10api-src.tar.xz Normal file
View File

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

View File

@ -1,5 +1,5 @@
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java 2019-09-25 10:43:47.764821845 +0200
--- java10api/javax/lang/model/util/AbstractAnnotationValueVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/AbstractAnnotationValueVisitor6.java 2019-09-25 10:43:47.764821845 +0200
@@ -75,7 +75,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -8,8 +8,8 @@
protected AbstractAnnotationValueVisitor6() {}
/**
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java 2019-09-25 10:44:11.829001049 +0200
--- java10api/javax/lang/model/util/AbstractElementVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/AbstractElementVisitor6.java 2019-09-25 10:44:11.829001049 +0200
@@ -75,7 +75,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -18,8 +18,8 @@
protected AbstractElementVisitor6(){}
/**
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java 2019-09-25 10:43:54.596872718 +0200
--- java10api/javax/lang/model/util/AbstractTypeVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/AbstractTypeVisitor6.java 2019-09-25 10:43:54.596872718 +0200
@@ -74,7 +74,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -28,8 +28,8 @@
protected AbstractTypeVisitor6() {}
/**
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java 2019-09-25 10:45:46.301704594 +0200
--- java10api/javax/lang/model/util/ElementKindVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/ElementKindVisitor6.java 2019-09-25 10:45:46.301704594 +0200
@@ -91,7 +91,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -46,8 +46,8 @@
protected ElementKindVisitor6(R defaultValue) {
super(defaultValue);
}
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java 2019-09-25 10:45:07.805417912 +0200
--- java10api/javax/lang/model/util/ElementScanner6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/ElementScanner6.java 2019-09-25 10:45:07.805417912 +0200
@@ -106,7 +106,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -64,8 +64,8 @@
protected ElementScanner6(R defaultValue){
DEFAULT_VALUE = defaultValue;
}
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java 2019-09-25 10:44:58.053345287 +0200
--- java10api/javax/lang/model/util/SimpleAnnotationValueVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/SimpleAnnotationValueVisitor6.java 2019-09-25 10:44:58.053345287 +0200
@@ -92,7 +92,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -82,8 +82,8 @@
protected SimpleAnnotationValueVisitor6(R defaultValue) {
super();
DEFAULT_VALUE = defaultValue;
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java 2019-09-25 10:45:31.181591992 +0200
--- java10api/javax/lang/model/util/SimpleElementVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/SimpleElementVisitor6.java 2019-09-25 10:45:31.181591992 +0200
@@ -94,7 +94,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -100,8 +100,8 @@
protected SimpleElementVisitor6(R defaultValue){
DEFAULT_VALUE = defaultValue;
}
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java 2019-09-25 10:45:17.877492913 +0200
--- java10api/javax/lang/model/util/SimpleTypeVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/SimpleTypeVisitor6.java 2019-09-25 10:45:17.877492913 +0200
@@ -94,7 +94,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -118,8 +118,8 @@
protected SimpleTypeVisitor6(R defaultValue){
DEFAULT_VALUE = defaultValue;
}
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java 2019-09-25 10:44:26.801112546 +0200
--- java10api/javax/lang/model/util/TypeKindVisitor6.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/lang/model/util/TypeKindVisitor6.java 2019-09-25 10:44:26.801112546 +0200
@@ -85,7 +85,6 @@
* @deprecated Release 6 is obsolete; update to a visitor for a newer
* release level.
@ -136,8 +136,8 @@
protected TypeKindVisitor6(R defaultValue) {
super(defaultValue);
}
--- jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/tools/ToolProvider.java 2018-06-24 16:07:06.000000000 +0200
+++ jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/tools/ToolProvider.java 2019-09-25 10:58:25.566820650 +0200
--- java10api/javax/tools/ToolProvider.java 2018-06-24 16:07:06.000000000 +0200
+++ java10api/javax/tools/ToolProvider.java 2019-09-25 10:58:25.566820650 +0200
@@ -94,7 +94,6 @@
* locate system tools as well as user-installed tools.
* @return a class loader, or {@code null}
@ -146,4 +146,4 @@
public static ClassLoader getSystemToolClassLoader() {
return null;
}
Only in jdk10u-45b1d041a4ef/src/java.compiler/share/classes/javax/tools: ToolProvider.java.bak
Only in java10api/javax/tools: ToolProvider.java.bak