From 5e5366e44467836cf4e16cb823b367f0a1864dfb3dc525018177cab303a03ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Sep 2014 11:38:53 +0000 Subject: [PATCH 1/5] Accepting request 249921 from home:dmacvicar:branches:Java:packages - clean spec file - export NO_BRP_CHECK_BYTECODE_VERSION - Update to ecj 4.2.1 (expected by tomcat 7.0.55+) - Sync with Fedora ecj-4.4 - Drop gcj patches OBS-URL: https://build.opensuse.org/request/show/249921 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ecj?expand=0&rev=19 --- MANIFEST.MF | 28 +++++ core-3.3.0-v_771.pom | 13 -- ecj-4.4.pom | 26 ++++ ecj-defaultto1.5.patch | 22 ---- ecj-gcj.tar.bz2 | 3 - ecj-generatedebuginfo.patch | 21 ---- ecj-include-props.patch | 8 +- ecj.1 | 216 ++++++++++++++++++++++++++++++++ ecj.changes | 17 +++ ecj.spec | 89 ++++++------- ecjsrc-4.2.1.jar | 3 - ecjsrc-4.4.jar | 3 + eclipse-gcj-compat4.2.1.patch | 20 --- eclipse-gcj-nodummysymbol.patch | 37 ------ 14 files changed, 332 insertions(+), 174 deletions(-) create mode 100644 MANIFEST.MF delete mode 100644 core-3.3.0-v_771.pom create mode 100644 ecj-4.4.pom delete mode 100644 ecj-defaultto1.5.patch delete mode 100644 ecj-gcj.tar.bz2 delete mode 100644 ecj-generatedebuginfo.patch create mode 100644 ecj.1 delete mode 100644 ecjsrc-4.2.1.jar create mode 100644 ecjsrc-4.4.jar delete mode 100644 eclipse-gcj-compat4.2.1.patch delete mode 100644 eclipse-gcj-nodummysymbol.patch diff --git a/MANIFEST.MF b/MANIFEST.MF new file mode 100644 index 0000000..f31ca90 --- /dev/null +++ b/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Main-Class: org.eclipse.jdt.internal.compiler.batch.Main +Bundle-ManifestVersion: 2 +Bundle-Name: Eclipse Compiler for Java(TM) +Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch +Bundle-Version: 3.10.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: Eclipse.org +Export-Package: org.eclipse.jdt.core, + org.eclipse.jdt.core.compiler, + org.eclipse.jdt.internal.antadapter;x-internal:=true, + org.eclipse.jdt.internal.compiler;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.dispatch;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.model;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.util;x-internal:=true, + org.eclipse.jdt.internal.compiler.ast;x-internal:=true, + org.eclipse.jdt.internal.compiler.batch;x-internal:=true, + org.eclipse.jdt.internal.compiler.classfmt;x-internal:=true, + org.eclipse.jdt.internal.compiler.codegen;x-internal:=true, + org.eclipse.jdt.internal.compiler.env;x-internal:=true, + org.eclipse.jdt.internal.compiler.flow;x-internal:=true, + org.eclipse.jdt.internal.compiler.impl;x-internal:=true, + org.eclipse.jdt.internal.compiler.lookup;x-internal:=true, + org.eclipse.jdt.internal.compiler.parser;x-internal:=true, + org.eclipse.jdt.internal.compiler.parser.diagnose;x-internal:=true, + org.eclipse.jdt.internal.compiler.problem;x-internal:=true, + org.eclipse.jdt.internal.compiler.util;x-internal:=true, + org.eclipse.jdt.internal.compiler.tool;x-internal:=true diff --git a/core-3.3.0-v_771.pom b/core-3.3.0-v_771.pom deleted file mode 100644 index aefc888..0000000 --- a/core-3.3.0-v_771.pom +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - org.eclipse.jdt - core - Java Development Tools Core - 3.3.0-v_771 - - - Eclipse Public License - v 1.0 - http://www.eclipse.org/org/documents/epl-v10.html - - - \ No newline at end of file diff --git a/ecj-4.4.pom b/ecj-4.4.pom new file mode 100644 index 0000000..797d904 --- /dev/null +++ b/ecj-4.4.pom @@ -0,0 +1,26 @@ + + + + 4.0.0 + org.eclipse.jdt.core.compiler + ecj + 4.4 + jar + Eclipse ECJ + Eclipse JDT Core Batch Compiler + http://www.eclipse.org/jdt/ + + UTF-8 + UTF-8 + + + + Eclipse Public License v1.0 + http://www.eclipse.org/org/documents/epl-v10.php + repo + + + \ No newline at end of file diff --git a/ecj-defaultto1.5.patch b/ecj-defaultto1.5.patch deleted file mode 100644 index d903571..0000000 --- a/ecj-defaultto1.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.jdt.core -Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v -retrieving revision 1.203 -diff -u -r1.203 CompilerOptions.java ---- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 14 Apr 2008 19:41:33 -0000 1.203 -+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 15 Dec 2008 19:50:02 -0000 -@@ -1145,9 +1145,9 @@ - - // by default only lines and source attributes are generated. - this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES; -- this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4 -- this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default -- this.targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2 -+ this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_5; -+ this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_5; -+ this.targetJDK = ClassFileConstants.JDK1_5; - - this.defaultEncoding = null; // will use the platform default encoding - diff --git a/ecj-gcj.tar.bz2 b/ecj-gcj.tar.bz2 deleted file mode 100644 index c4ab961..0000000 --- a/ecj-gcj.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:253996e9541763a1042984a103a531142e803260bdff79f730237bc49a716b26 -size 6329 diff --git a/ecj-generatedebuginfo.patch b/ecj-generatedebuginfo.patch deleted file mode 100644 index e64a044..0000000 --- a/ecj-generatedebuginfo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./build.xml.sav ./build.xml ---- ./build.xml.sav 2009-03-11 13:30:38.000000000 -0400 -+++ ./build.xml 2009-03-11 13:30:34.000000000 -0400 -@@ -10,7 +10,7 @@ - - - -@@ -18,7 +18,7 @@ - - - diff --git a/ecj-include-props.patch b/ecj-include-props.patch index b9c502d..81ae964 100644 --- a/ecj-include-props.patch +++ b/ecj-include-props.patch @@ -1,7 +1,7 @@ ---- a/build.xml 2012-10-09 13:56:47.695928242 -0400 -+++ b/build.xml 2012-10-09 13:57:06.822893233 -0400 -@@ -46,6 +46,7 @@ - +--- build.xml 2014-05-01 09:36:51.417339328 +0300 ++++ build.xml 2014-05-01 09:38:36.330493400 +0300 +@@ -49,6 +49,7 @@ + + diff --git a/ecj.1 b/ecj.1 new file mode 100644 index 0000000..e45b4d9 --- /dev/null +++ b/ecj.1 @@ -0,0 +1,216 @@ +.TH ECJ "1" "May 2013" +.SH NAME +ecj \- manual page for eclipse JDT Compiler +.SH SYNOPSIS +.B ecj \fR +.SH DESCRIPTION +The JDT Compiler (jdtc) is a command version of Java compiler for eclipse. ecj +has basic java compiler options like SUN's javac. +.SH OPTIONS +.TP 20 +\fB\-help\fR +display a help message +.TP +\fB\-version\fR +compiler version number +.SS Classpath options: +.br +.TP 20 +\fB\-cp \-classpath\fR +specify location for application classes and sources. Each directory or file can specify access rules for types between '[' and ']' (e.g. [-X] to forbid access to type X, [~X] to discourage access to type X, [+p/X:-p/*] to forbid access to all types in package p but allow access to p/X) +.TP +\fB\-bootclasspath\fR +specify location for system classes. Each directory or file can specify access rules for types between '[' and ']' +.TP +\fB\-sourcepath\fR +specify location for application sources. Each directory or file can specify access rules for types between '[' and ']'. Each directory can further specify a specific destination directory using a '-d' option between '[' and ']'; this overrides the general '-d' option. +.br +\[char46]class files created from source files contained in a jar file are put in the user.dir folder in case no general '-d' option is specified. ZIP archives cannot override the general '-d' option +.TP +\fB\-extdirs\fR +specify location for extension ZIP archives +.TP +\fB\-endoreseddirs\fR +specify location for endorsed ZIP archives +.TP +\fB\-d\fR +destination directory (if omitted no package directory structure is created); this option can be overridden per source directory +.TP +\fB\-d\fR none +generate no .class files +.TP +\fB\-encoding \fR +specify default encoding for all source files. Each file/directory can override it when suffixed with '['']' (e.g. X.java[utf8]). +.br +If multiple default encodings are specified, the last one will be used. +.SS Compliance options: +.TP 20 +\fB\-1.3\fR +use 1.3 compliance (-source 1.3 -target 1.1) +.TP +\fB\-1.4\fR +use 1.4 compliance (-source 1.3 -target 1.2) (default) +.TP +\fB\-1.5 \-5 \-5.0\fR +use 1.5 compliance (-source 1.5 -target 1.5) +.TP +\fB\-1.6 \-6 \-6.0\fR +use 1.6 compliance (-source 1.6 -target 1.6) +.TP +\fB\-1.7 \-7 \-7.0\fR +use 1.7 compliance (-source 1.7 -target 1.7) +.TP +\fB\-source\fR +set source level: 1.3 to 1.7 (or 5, 5.0, etc) +.TP +\fB\-target\fR +set classfile target: 1.1 to 1.7 (or 5, 5.0, etc) +.br +cldc1.1 can also be used to generate the StackMap attribute +.SS Warning options: +.TP 20 +\fB\-deprecation +deprecation outside deprecated code (equivalent to '-warn:+deprecation', default) +.TP +\fB\-nowarn -warn:none\fR +disable all warnings +.TP +\fB-nowarn:[]\fR +specify directories from which optional problems should be ignored +.TP +\fB\-?:warn -help:warn\fR +display advanced warning options +.SS Error options: +.TP +\fB\-err: +convert exactly the listed warnings to be reported as errors +.TP +\fB\-err:+ +enable additional warnings to be reported as errors +.TP +\fB\-err:- +disable specific warnings to be reported as errors +.SS Setting warning or error options using properties file: +.TP 20 +\fB\-properties +set warnings/errors option based on the properties file contents. This option can be used with -nowarn, -err:.. or -warn:.. options, but the last one on the command line sets the options to be used. +.SS Debug options: +.TP 20 +\fB\-g[:lines,vars,source]\fR +custom debug info +.TP +\fB\-g:lines,source\fR +both lines table and source debug info (default) +.TP +\fB\-g\fR +all debug info +.TP +\fB\-g:none\fR +no debug info +.TP +\fB\-preserveAllLocals\fR +preserve unused local vars for debug purpose +.SS Annotation processing options: +.PP +These options are meaningful only in a 1.6 environment. +.TP 20 +\fB\-Akey[=value]\fN +options that are passed to annotation processors +.TP +\fB\-processorpath\fR +specify locations where to find annotation processors. If this option is not used, the classpath will be searched for processors +.TP +\fB\-processor\fR +qualified names of the annotation processors to run. This bypasses the default annotation discovery process +.TP +\fB\-proc:only +run annotation processors, but do not compile +.TP +\fB\-proc:none +perform compilation but do not run annotation processors +.TP +\fB\-s \fR +destination directory for generated source files +.TP +\fB\-XprintProcessorInfo\fR +print information about which annotations and elements a processor is asked to process +.TP +\fB\-XprintRounds\fR +print information about annotation processing rounds +.TP +\fB\-classNames \fR +qualified names of binary classes to process +.SS Advanced options: +.TP 20 +\fB\@\fR +read command line arguments from file +.TP +\fB\-maxProblems \fR +max number of problems per compilation unit (100 by default) +.TP +\fB\-log \fR +log to a file. If the file extension is '.xml', then the log will be a xml file. +.TP +\fB\-proceedOnError[:Fatal]\fR +do not stop at first error, dumping class files with problem methods +.br +With ":Fatal", all optional errors are treated as fatal +.TP +\fB\-verbose\fR +enable verbose output +.TP +\fB\-referenceInfo\fR +compute reference info +.TP +\fB\-progress\fR +show progress (only in -log mode) +.TP +\fB\-time\fR +display speed information +.TP +\fB\-noExit\fR +do not call System.exit(n) at end of compilation (n==0 if no error) +.TP +\fB\-repeat \fR +repeat compilation process times for perf analysis +.TP +\fB\-inlineJSR\fR +inline JSR bytecode (implicit if target >= 1.5) +.TP +\fB\-enableJavadoc\fR +consider references in javadoc +.TP +\fB\-Xemacs\fR +used to enable emacs-style output in the console. +.br +It does not affect the xml log output +.TP +\fB\-missingNullDefault\fR +report missing default nullness annotation +.TP +\fB\-? \-help\fR +print help message +.TP +\fB\-v \-version\fR +print compiler version +.TP +\fB\-showversion\fR +print compiler version and continue +.SS Ignored options: +.TP 20 +\fB\-J