diff --git a/eclipse-ecj-defaultto1.5.patch b/eclipse-ecj-defaultto1.5.patch new file mode 100644 index 0000000..e96a403 --- /dev/null +++ b/eclipse-ecj-defaultto1.5.patch @@ -0,0 +1,44 @@ +### 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 +@@ -253,9 +253,9 @@ + // By default only lines and source attributes are generated. + public int produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES; + +- public long complianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4 +- public long sourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default +- public long targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2 ++ public long complianceLevel = ClassFileConstants.JDK1_5; // by default be compliant with 1.4 ++ public long sourceLevel = ClassFileConstants.JDK1_5; //1.3 source behavior by default ++ public long targetJDK = ClassFileConstants.JDK1_5; // default generates for JVM1.2 + + // source encoding format + public String defaultEncoding = null; // will use the platform default encoding +@@ -757,7 +757,7 @@ + } else if (DISABLED.equals(optionValue)) { + this.reportUnusedParameterIncludeDocCommentReference = false; + } +- } ++ } + if ((optionValue = optionsMap.get(OPTION_ReportSpecialParameterHidingField)) != null) { + if (ENABLED.equals(optionValue)) { + this.reportSpecialParameterHidingField = true; +@@ -944,10 +944,10 @@ + } + if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocComments)) != null) { + updateSeverity(MissingJavadocComments, optionValue); +- } ++ } + if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocTagDescription)) != null) { + this.reportMissingJavadocTagDescription = (String) optionValue; +- } ++ } + if ((optionValue = optionsMap.get(OPTION_ReportMissingJavadocCommentsVisibility)) != null) { + if (PUBLIC.equals(optionValue)) { + this.reportMissingJavadocCommentsVisibility = ClassFileConstants.AccPublic; diff --git a/eclipse.spec b/eclipse.spec index 09a73ac..e6bbe9c 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -157,6 +157,10 @@ Patch42: %{name}-tests-libraryXml.patch Patch43: %{name}-osgi-classpath.patch Patch44: %{name}-fix-javahome64.patch +# Default to 1.5 source and bytecode +# https://bugzilla.redhat.com/354721 +Patch45: %{name}-ecj-defaultto1.5.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -350,6 +354,7 @@ sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \ pushd plugins/org.eclipse.jdt.core %patch14 -p0 +%patch45 -p0 popd pushd plugins/org.eclipse.pde.build @@ -1539,6 +1544,7 @@ fi %changelog * Mon Dec 15 2008 Andrew Overholt 1:3.4.1-12 - Update pdebuild and package-build patch to include -z option. +- Make ecj default to 1.5 (rh#354721). * Fri Dec 5 2008 Andrew Overholt 1:3.4.1-10 - Remove MaxPermSize from sysproperty lists in library.xml as it was causing the