From 4382774a36b333aa182ede431673e31edd8fe958 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Feb 21 2007 18:52:39 +0000 Subject: - 3.2.2. - Remove patch that disables Java 5 code. - Add -DjavacSource=1.5 -DjavacTarget=1.5 to ant compile line. --- diff --git a/.cvsignore b/.cvsignore index 59baa23..f1d4db0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ icu4jsrc_3_4_5.jar -eclipse-sourceBuild-srcIncluded-3.2.1.zip -eclipse-fedora-splash-3.2.1.png eclipse-fileinitializerapp.tar.bz2 +eclipse-sourceBuild-srcIncluded-3.2.2.zip +eclipse-fedora-splash-3.2.2.png diff --git a/eclipse-add-ppc64-sparc64-s390-s390x.patch b/eclipse-add-ppc64-sparc64-s390-s390x.patch index 33a8d63..c3808eb 100644 --- a/eclipse-add-ppc64-sparc64-s390-s390x.patch +++ b/eclipse-add-ppc64-sparc64-s390-s390x.patch @@ -142,24 +142,24 @@ diff -ru features/org.eclipse.platform.source/feature.xml features/org.eclipse.p --- features/org.eclipse.platform.source/feature.xml 2007-02-06 19:04:05.000000000 -0500 +++ features/org.eclipse.platform.source/feature.xml 2007-02-06 19:07:26.000000000 -0500 @@ -28,4 +28,8 @@ - - - -+ -+ -+ -+ + + + ++ ++ ++ ++ diff -ru features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml --- features/org.eclipse.rcp.source/feature.xml 2007-02-06 19:04:06.000000000 -0500 +++ features/org.eclipse.rcp.source/feature.xml 2007-02-06 19:09:11.000000000 -0500 @@ -28,4 +28,9 @@ - - - -+ -+ -+ -+ -+ + + + ++ ++ ++ ++ ++ diff --git a/eclipse-build.patch b/eclipse-build.patch index b185340..0a90607 100644 --- a/eclipse-build.patch +++ b/eclipse-build.patch @@ -24,14 +24,3 @@ diff -u -r1.9 build.xml -@@ -265,8 +277,8 @@ - - - -- -- -+ - - - diff --git a/eclipse-ecj-gcj.patch b/eclipse-ecj-gcj.patch index e056b6f..c7cae7e 100644 --- a/eclipse-ecj-gcj.patch +++ b/eclipse-ecj-gcj.patch @@ -1,746 +1,10 @@ -Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v -retrieving revision 1.254 -diff -u -r1.254 Main.java ---- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2 May 2006 13:45:31 -0000 1.254 -+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 18 Jul 2006 22:46:41 -0000 -@@ -1392,6 +1392,391 @@ - } - - /* -+Handle a single warning token. -+*/ -+protected void handleWarningToken(String token, boolean isEnabling, -+ boolean useEnableJavadoc) throws InvalidInputException { -+ if (token.equals("constructorName")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportMethodWithConstructorName, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("pkgDefaultMethod") || token.equals("packageDefaultMethod")/*backward compatible*/ ) { //$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportHiddenCatchBlock, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("deprecation")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportDeprecation, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, -+ CompilerOptions.DISABLED); -+ this.options.put( -+ CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, -+ CompilerOptions.DISABLED); -+ } else if (token.equals("allDeprecation")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportDeprecation, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, -+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -+ this.options.put( -+ CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, -+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -+ } else if (token.equals("unusedLocal") || token.equals("unusedLocals")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedLocal, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unusedArgument") || token.equals("unusedArguments")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedParameter, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unusedImport") || token.equals("unusedImports")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedImport, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unusedPrivate")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedPrivateMember, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unusedLabel")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedLabel, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("localHiding")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportLocalVariableHiding, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("fieldHiding")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportFieldHiding, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("specialParamHiding")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportSpecialParameterHidingField, -+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -+ } else if (token.equals("conditionAssign")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportPossibleAccidentalBooleanAssignment, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("syntheticAccess") //$NON-NLS-1$ -+ || token.equals("synthetic-access")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportSyntheticAccessEmulation, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("nls")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportNonExternalizedStringLiteral, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("staticReceiver")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportNonStaticAccessToStatic, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("indirectStatic")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportIndirectStaticAccess, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("noEffectAssign")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportNoEffectAssignment, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("intfNonInherited") || token.equals("interfaceNonInherited")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportIncompatibleNonInheritedInterfaceMethod, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("charConcat") || token.equals("noImplicitStringConversion")/*backward compatible*/) {//$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportNoImplicitStringConversion, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("semicolon")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportEmptyStatement, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("serial")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingSerialVersion, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("emptyBlock")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("uselessTypeCheck")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnnecessaryTypeCheck, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unchecked") || token.equals("unsafe")) {//$NON-NLS-1$ //$NON-NLS-2$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUncheckedTypeOperation, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("raw")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportRawTypeReference, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("finalBound")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportFinalParameterBound, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("suppress")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_SuppressWarnings, -+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -+ } else if (token.equals("warningToken")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnhandledWarningToken, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unnecessaryElse")) {//$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnnecessaryElse, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("javadoc")) {//$NON-NLS-1$ -+ if (!useEnableJavadoc) { -+ this.options.put( -+ CompilerOptions.OPTION_DocCommentSupport, -+ isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED); -+ } -+ // if disabling then it's not necessary to set other javadoc options -+ if (isEnabling) { -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadoc, -+ CompilerOptions.WARNING); -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadocTags, -+ CompilerOptions.ENABLED); -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef, -+ CompilerOptions.DISABLED); -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef, -+ CompilerOptions.DISABLED); -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, -+ CompilerOptions.PRIVATE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingJavadocTags, -+ CompilerOptions.WARNING); -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, -+ CompilerOptions.PRIVATE); -+ } -+ } else if (token.equals("allJavadoc")) { //$NON-NLS-1$ -+ if (!useEnableJavadoc) { -+ this.options.put( -+ CompilerOptions.OPTION_DocCommentSupport, -+ isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED); -+ } -+ // if disabling then it's not necessary to set other javadoc options -+ if (isEnabling) { -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadoc, -+ CompilerOptions.WARNING); -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadocTags, -+ CompilerOptions.ENABLED); -+ this.options.put( -+ CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, -+ CompilerOptions.PRIVATE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingJavadocTags, -+ CompilerOptions.WARNING); -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, -+ CompilerOptions.PRIVATE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingJavadocComments, -+ CompilerOptions.WARNING); -+ } -+ } else if (token.startsWith("tasks")) { //$NON-NLS-1$ -+ String taskTags = ""; //$NON-NLS-1$ -+ int start = token.indexOf('('); -+ int end = token.indexOf(')'); -+ if (start >= 0 && end >= 0 && start < end){ -+ taskTags = token.substring(start+1, end).trim(); -+ taskTags = taskTags.replace('|',','); -+ } -+ if (taskTags.length() == 0){ -+ throw new InvalidInputException(Main.bind("configure.invalidTaskTag", token)); //$NON-NLS-1$ -+ } -+ this.options.put( -+ CompilerOptions.OPTION_TaskTags, -+ isEnabling ? taskTags : ""); //$NON-NLS-1$ -+ } else if (token.equals("assertIdentifier")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportAssertIdentifier, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("enumIdentifier")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportEnumIdentifier, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("finally")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportFinallyBlockNotCompletingNormally, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unusedThrown")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedDeclaredThrownException, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unqualifiedField") //$NON-NLS-1$ -+ || token.equals("unqualified-field-access")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnqualifiedFieldAccess, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("typeHiding")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportTypeParameterHiding, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("varargsCast")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportVarargsArgumentNeedCast, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("null")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportNullReference, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("boxing")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportAutoboxing, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("over-ann")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingOverrideAnnotation, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("dep-ann")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportMissingDeprecatedAnnotation, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("intfAnnotation")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportAnnotationSuperInterface, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("enumSwitch") //$NON-NLS-1$ -+ || token.equals("incomplete-switch")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportIncompleteEnumSwitch, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("hiding")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportHiddenCatchBlock, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportLocalVariableHiding, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportFieldHiding, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportTypeParameterHiding, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("static-access")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportNonStaticAccessToStatic, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportIndirectStaticAccess, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("unused")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedLocal, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedParameter, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedImport, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedPrivateMember, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedDeclaredThrownException, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ this.options.put( -+ CompilerOptions.OPTION_ReportUnusedLabel, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("paramAssign")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportParameterAssignment, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("discouraged")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportDiscouragedReference, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("forbidden")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportForbiddenReference, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else if (token.equals("fallthrough")) { //$NON-NLS-1$ -+ this.options.put( -+ CompilerOptions.OPTION_ReportFallthroughCase, -+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -+ } else { -+ throw new InvalidInputException(Main.bind("configure.invalidWarning", token)); //$NON-NLS-1$ -+ } -+} -+ -+/* -+Handle extdirs processing -+*/ -+protected ArrayList handleExtdirs(ArrayList extdirsClasspaths) { -+ final File javaHome = getJavaHome(); -+ final int DEFAULT_SIZE_CLASSPATH = 4; -+ -+ /* -+ * Feed endorsedDirClasspath according to: -+ * - -extdirs first if present; -+ * - else java.ext.dirs if defined; -+ * - else default extensions directory for the platform. -+ */ -+ if (extdirsClasspaths == null) { -+ extdirsClasspaths = new ArrayList(DEFAULT_SIZE_CLASSPATH); -+ String extdirsStr = System.getProperty("java.ext.dirs"); //$NON-NLS-1$ -+ if (extdirsStr == null) { -+ extdirsClasspaths.add(javaHome.getAbsolutePath() + "/lib/ext"); //$NON-NLS-1$ -+ } else { -+ StringTokenizer tokenizer = new StringTokenizer(extdirsStr, File.pathSeparator); -+ while (tokenizer.hasMoreTokens()) -+ extdirsClasspaths.add(tokenizer.nextToken()); -+ } -+ } -+ -+ /* -+ * Feed extdirsClasspath with the entries found into the directories listed by -+ * extdirsNames. -+ */ -+ if (extdirsClasspaths.size() != 0) { -+ File[] directoriesToCheck = new File[extdirsClasspaths.size()]; -+ for (int i = 0; i < directoriesToCheck.length; i++) -+ directoriesToCheck[i] = new File((String) extdirsClasspaths.get(i)); -+ extdirsClasspaths.clear(); -+ File[][] extdirsJars = getLibrariesFiles(directoriesToCheck); -+ if (extdirsJars != null) { -+ for (int i = 0, max = extdirsJars.length; i < max; i++) { -+ File[] current = extdirsJars[i]; -+ if (current != null) { -+ for (int j = 0, max2 = current.length; j < max2; j++) { -+ FileSystem.Classpath classpath = -+ FileSystem.getClasspath( -+ current[j].getAbsolutePath(), -+ null, null); -+ if (classpath != null) { -+ extdirsClasspaths.add(classpath); -+ } -+ } -+ } else if (directoriesToCheck[i].isFile()) { -+ this.logger.logIncorrectExtDirsEntry(directoriesToCheck[i].getAbsolutePath()); -+ } -+ } -+ } -+ } -+ -+ return extdirsClasspaths; -+} -+ -+/* - Decode the command line arguments - */ - public void configure(String[] argv) throws InvalidInputException { -@@ -1848,326 +2233,7 @@ - while (tokenizer.hasMoreTokens()) { - String token = tokenizer.nextToken(); - tokenCounter++; -- if (token.equals("constructorName")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportMethodWithConstructorName, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("pkgDefaultMethod") || token.equals("packageDefaultMethod")/*backward compatible*/ ) { //$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportHiddenCatchBlock, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("deprecation")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportDeprecation, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, -- CompilerOptions.DISABLED); -- this.options.put( -- CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, -- CompilerOptions.DISABLED); -- } else if (token.equals("allDeprecation")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportDeprecation, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, -- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -- this.options.put( -- CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod, -- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -- } else if (token.equals("unusedLocal") || token.equals("unusedLocals")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedLocal, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unusedArgument") || token.equals("unusedArguments")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedParameter, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unusedImport") || token.equals("unusedImports")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedImport, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unusedPrivate")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedPrivateMember, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unusedLabel")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedLabel, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("localHiding")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportLocalVariableHiding, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("fieldHiding")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportFieldHiding, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("specialParamHiding")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportSpecialParameterHidingField, -- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -- } else if (token.equals("conditionAssign")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportPossibleAccidentalBooleanAssignment, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("syntheticAccess") //$NON-NLS-1$ -- || token.equals("synthetic-access")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportSyntheticAccessEmulation, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("nls")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportNonExternalizedStringLiteral, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("staticReceiver")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportNonStaticAccessToStatic, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("indirectStatic")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportIndirectStaticAccess, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("noEffectAssign")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportNoEffectAssignment, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("intfNonInherited") || token.equals("interfaceNonInherited")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportIncompatibleNonInheritedInterfaceMethod, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("charConcat") || token.equals("noImplicitStringConversion")/*backward compatible*/) {//$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportNoImplicitStringConversion, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("semicolon")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportEmptyStatement, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("serial")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportMissingSerialVersion, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("emptyBlock")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUndocumentedEmptyBlock, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("uselessTypeCheck")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnnecessaryTypeCheck, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unchecked") || token.equals("unsafe")) {//$NON-NLS-1$ //$NON-NLS-2$ -- this.options.put( -- CompilerOptions.OPTION_ReportUncheckedTypeOperation, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("raw")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportRawTypeReference, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("finalBound")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportFinalParameterBound, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("suppress")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_SuppressWarnings, -- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED); -- } else if (token.equals("warningToken")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnhandledWarningToken, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unnecessaryElse")) {//$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnnecessaryElse, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("javadoc")) {//$NON-NLS-1$ -- if (!useEnableJavadoc) { -- this.options.put( -- CompilerOptions.OPTION_DocCommentSupport, -- isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED); -- } -- // if disabling then it's not necessary to set other javadoc options -- if (isEnabling) { -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadoc, -- CompilerOptions.WARNING); -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadocTags, -- CompilerOptions.ENABLED); -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef, -- CompilerOptions.DISABLED); -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef, -- CompilerOptions.DISABLED); -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, -- CompilerOptions.PRIVATE); -- this.options.put( -- CompilerOptions.OPTION_ReportMissingJavadocTags, -- CompilerOptions.WARNING); -- this.options.put( -- CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, -- CompilerOptions.PRIVATE); -- } -- } else if (token.equals("allJavadoc")) { //$NON-NLS-1$ -- if (!useEnableJavadoc) { -- this.options.put( -- CompilerOptions.OPTION_DocCommentSupport, -- isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED); -- } -- // if disabling then it's not necessary to set other javadoc options -- if (isEnabling) { -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadoc, -- CompilerOptions.WARNING); -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadocTags, -- CompilerOptions.ENABLED); -- this.options.put( -- CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility, -- CompilerOptions.PRIVATE); -- this.options.put( -- CompilerOptions.OPTION_ReportMissingJavadocTags, -- CompilerOptions.WARNING); -- this.options.put( -- CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, -- CompilerOptions.PRIVATE); -- this.options.put( -- CompilerOptions.OPTION_ReportMissingJavadocComments, -- CompilerOptions.WARNING); -- } -- } else if (token.startsWith("tasks")) { //$NON-NLS-1$ -- String taskTags = ""; //$NON-NLS-1$ -- int start = token.indexOf('('); -- int end = token.indexOf(')'); -- if (start >= 0 && end >= 0 && start < end){ -- taskTags = token.substring(start+1, end).trim(); -- taskTags = taskTags.replace('|',','); -- } -- if (taskTags.length() == 0){ -- throw new InvalidInputException(Main.bind("configure.invalidTaskTag", token)); //$NON-NLS-1$ -- } -- this.options.put( -- CompilerOptions.OPTION_TaskTags, -- isEnabling ? taskTags : ""); //$NON-NLS-1$ -- } else if (token.equals("assertIdentifier")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportAssertIdentifier, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("enumIdentifier")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportEnumIdentifier, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("finally")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportFinallyBlockNotCompletingNormally, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unusedThrown")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedDeclaredThrownException, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unqualifiedField") //$NON-NLS-1$ -- || token.equals("unqualified-field-access")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnqualifiedFieldAccess, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("typeHiding")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportTypeParameterHiding, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("varargsCast")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportVarargsArgumentNeedCast, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("null")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportNullReference, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("boxing")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportAutoboxing, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("over-ann")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportMissingOverrideAnnotation, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("dep-ann")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportMissingDeprecatedAnnotation, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("intfAnnotation")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportAnnotationSuperInterface, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("enumSwitch") //$NON-NLS-1$ -- || token.equals("incomplete-switch")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportIncompleteEnumSwitch, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("hiding")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportHiddenCatchBlock, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportLocalVariableHiding, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportFieldHiding, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportTypeParameterHiding, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("static-access")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportNonStaticAccessToStatic, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportIndirectStaticAccess, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("unused")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedLocal, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedParameter, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedImport, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedPrivateMember, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedDeclaredThrownException, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- this.options.put( -- CompilerOptions.OPTION_ReportUnusedLabel, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("paramAssign")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportParameterAssignment, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("discouraged")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportDiscouragedReference, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("forbidden")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportForbiddenReference, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else if (token.equals("fallthrough")) { //$NON-NLS-1$ -- this.options.put( -- CompilerOptions.OPTION_ReportFallthroughCase, -- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE); -- } else { -- throw new InvalidInputException(Main.bind("configure.invalidWarning", token)); //$NON-NLS-1$ -- } -+ handleWarningToken(token, isEnabling, useEnableJavadoc); - } - if (tokenCounter == 0) - throw new InvalidInputException( -@@ -2708,7 +2774,7 @@ - this.timesCounter = 0; - } - } --private void disableWarnings() { -+protected void disableWarnings() { - Object[] entries = this.options.entrySet().toArray(); - for (int i = 0, max = entries.length; i < max; i++) { - Map.Entry entry = (Map.Entry) entries[i]; Index: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java =================================================================== RCS file: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 1 Jan 1970 00:00:00 -0000 -@@ -0,0 +1,442 @@ +@@ -0,0 +1,495 @@ +/** + * + */ @@ -914,16 +178,16 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + String customEncoding = null; + AccessRule[] accessRules = new AccessRule[0]; + String templates[] = new String[AccessRuleSet.MESSAGE_TEMPLATES_LENGTH]; -+ templates[0] = Main.bind( ++ templates[0] = this.bind( + "template.restrictedAccess.type", //$NON-NLS-1$ + new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$ -+ templates[1] = Main.bind( ++ templates[1] = this.bind( + "template.restrictedAccess.constructor", //$NON-NLS-1$ + new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$ -+ templates[2] = Main.bind( ++ templates[2] = this.bind( + "template.restrictedAccess.method", //$NON-NLS-1$ + new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ -+ templates[3] = Main.bind( ++ templates[3] = this.bind( + "template.restrictedAccess.field", //$NON-NLS-1$ + new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$ + AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, templates); @@ -974,6 +238,20 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + super.handleWarningToken(token, isEnabling, useEnableJavadoc); + } + ++ private void turnWarningsToErrors() { ++ Object[] entries = this.options.entrySet().toArray(); ++ for (int i = 0, max = entries.length; i < max; i++) { ++ Map.Entry entry = (Map.Entry) entries[i]; ++ if (!(entry.getKey() instanceof String)) ++ continue; ++ if (!(entry.getValue() instanceof String)) ++ continue; ++ if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) { ++ this.options.put(entry.getKey(), CompilerOptions.ERROR); ++ } ++ } ++ } ++ + /** + * Set the debug level to the indicated value. The level should be + * between 0 and 2, inclusive, but this is not checked. @@ -1012,6 +290,30 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + } + } + ++ private void handleWall(boolean enable) throws InvalidInputException { ++ // A somewhat arbitrary list. We use the GCC names ++ // here, and the local handleWarningToken translates ++ // for us. ++ handleWarningToken("constructor-name", enable, false); ++ handleWarningToken("pkg-default-method", enable, false); ++ handleWarningToken("masked-catch-block", enable, false); ++ handleWarningToken("all-deprecation", enable, false); ++ handleWarningToken("unused-local", enable, false); ++ handleWarningToken("unused-label", enable, false); ++ handleWarningToken("static-receiver", enable, false); ++ handleWarningToken("indirect-static", enable, false); ++ handleWarningToken("no-effect-assign", enable, false); ++ handleWarningToken("char-concat", enable, false); ++ handleWarningToken("useless-type-check", enable, false); ++ handleWarningToken("final-bound", enable, false); ++ handleWarningToken("assert-identifier", enable, false); ++ handleWarningToken("enum-identifier", enable, false); ++ handleWarningToken("finally", enable, false); ++ handleWarningToken("varargs-cast", enable, false); ++ handleWarningToken("unused", enable, false); ++ handleWarningToken("forbidden", enable, false); ++ } ++ + public void configure(String[] argv) throws InvalidInputException { + if ((argv == null) || (argv.length == 0)) { + // This is a "can't happen". @@ -1022,6 +324,8 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + ArrayList otherFiles = new ArrayList(); + String classpath = null; + boolean haveFileList = false; ++ boolean inhibitAllWarnings = false; ++ boolean treatWarningsAsErrors = false; + + for (int i = 0; i < argv.length; ++i) { + String currentArg = argv[i]; @@ -1033,7 +337,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding); + } catch (UnsupportedEncodingException e) { + throw new InvalidInputException( -+ Main.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$ ++ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$ + } + this.options.put(CompilerOptions.OPTION_Encoding, encoding); + } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$ @@ -1044,23 +348,21 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + errorMessage.append(' '); + errorMessage.append(arg); + throw new InvalidInputException( -+ Main.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ ++ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ + } + this.destinationPath = arg; -+ this.generatePackagesStructure = true; ++ // this.generatePackagesStructure = true; + } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ + classpath = getArgument(currentArg); + } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ + ++i; + if (i >= argv.length) -+ // FIXME: i18n. -+ throw new InvalidInputException("-fzip-target requires argument"); ++ throw new InvalidInputException(this.bind("gcc.zipArg")); //$NON-NLS-1$ + this.zipDestination = argv[i]; + } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$ + ++i; + if (i >= argv.length) -+ // FIXME: i18n. -+ throw new InvalidInputException("-fzip-dependency requires argument"); ++ throw new InvalidInputException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$ + this.zipDependencyDestination = argv[i]; + } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$ + if (currentArg.equals("-g0")) { //$NON-NLS-1$ @@ -1072,12 +374,20 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + // Handle -g1 but also things like -gstabs. + setDebugLevel(1); + } ++ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$ ++ treatWarningsAsErrors = true; ++ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$ ++ treatWarningsAsErrors = false; ++ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$ ++ handleWall(true); ++ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$ ++ handleWall(false); + } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$ + handleWarningToken(currentArg.substring(5), false, false); + } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$ + handleWarningToken(currentArg.substring(2), true, false); + } else if (currentArg.equals("-w")) { //$NON-NLS-1$ -+ disableWarnings(); ++ inhibitAllWarnings = true; + } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$ + // Ignore. + } else if (currentArg.equals("-v")) { //$NON-NLS-1$ @@ -1095,7 +405,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); + } else { -+ throw new InvalidInputException(Main.bind("configure.source", currentArg)); //$NON-NLS-1$ ++ throw new InvalidInputException(this.bind("configure.source", currentArg)); //$NON-NLS-1$ + } + } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$ + currentArg = getArgument(currentArg); @@ -1114,7 +424,7 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$ + this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14); + } else { -+ throw new InvalidInputException(Main.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$ ++ throw new InvalidInputException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$ + } + } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$ + haveFileList = true; @@ -1134,12 +444,14 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + + this.filenames = (String[]) files.toArray(new String[0]); + this.encodings = new String[this.filenames.length]; ++ this.destinationPaths = new String[this.filenames.length]; ++ for (int i = 0; i < this.filenames.length; ++i) ++ this.destinationPaths[i] = this.destinationPath; + + // Classpath processing. + ArrayList result = new ArrayList(); + if (classpath == null) -+ // FIXME: update resources. -+ throw new InvalidInputException("no classpath specified"); ++ throw new InvalidInputException(this.bind("gcc.noClasspath")); //$NON-NLS-1$ + parsePath(result, classpath); + + // We must always create both output files, even if one is not used. @@ -1151,6 +463,11 @@ diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java + fail(err); + } + ++ if (inhibitAllWarnings) ++ disableWarnings(); ++ if (treatWarningsAsErrors) ++ turnWarningsToErrors(); ++ + this.checkedClasspaths = new FileSystem.Classpath[result.size()]; + result.toArray(this.checkedClasspaths); + diff --git a/eclipse-ecj-square-bracket-classpath.patch b/eclipse-ecj-square-bracket-classpath.patch index 0f89c47..ed815a7 100644 --- a/eclipse-ecj-square-bracket-classpath.patch +++ b/eclipse-ecj-square-bracket-classpath.patch @@ -1,11 +1,11 @@ Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v -retrieving revision 1.254.4.1 -diff -u -r1.254.4.1 Main.java ---- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2 Jul 2006 10:11:58 -0000 1.254.4.1 -+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 1 Feb 2007 21:04:52 -0000 -@@ -2989,6 +2989,10 @@ +retrieving revision 1.254.4.2 +diff -u -r1.254.4.2 Main.java +--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Oct 2006 14:11:48 -0000 1.254.4.2 ++++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 16 Feb 2007 18:40:23 -0000 +@@ -2723,6 +2723,10 @@ ArrayList currentRuleSpecs = new ArrayList(defaultSize); StringTokenizer tokenizer = new StringTokenizer(currentPath, File.pathSeparator + "[]", true); //$NON-NLS-1$ @@ -16,7 +16,7 @@ diff -u -r1.254.4.1 Main.java // state machine final int start = 0; final int readyToClose = 1; -@@ -3003,14 +3007,21 @@ +@@ -2737,14 +2741,20 @@ // 'path[' 'path1;path2[' final int rulesReadyToClose = 6; // 'path[rule' 'path[rule1;rule2' @@ -24,23 +24,22 @@ diff -u -r1.254.4.1 Main.java + // '.*[.*' + final int bracketClosed = 8; + // '.*([.*])+' -+ final int error = 99; int state = start; String token = null; -- while (tokenizer.hasMoreTokens()) { +- while (tokenizer.hasMoreTokens() && state != error) { - token = tokenizer.nextToken(); -+ int cursor = 0, tokensNb = tokens.size(), bracket = -1; -+ while (cursor < tokensNb && state != error) { -+ token = (String) tokens.get(cursor++); ++ int cursor = 0, tokensNb = tokens.size(), bracket = -1; ++ while (cursor < tokensNb && state != error) { ++ token = (String) tokens.get(cursor++); if (token.equals(File.pathSeparator)) { switch (state) { case start: -+ case bracketOpened: ++ case bracketOpened: break; case readyToClose: case readyToCloseEndingWithRules: -@@ -3022,14 +3033,21 @@ +@@ -2757,14 +2767,21 @@ case rulesReadyToClose: state = rulesNeedAnotherRule; break; @@ -63,7 +62,7 @@ diff -u -r1.254.4.1 Main.java default: state = error; } -@@ -3038,6 +3056,10 @@ +@@ -2773,6 +2790,10 @@ case rulesReadyToClose: state = readyToCloseEndingWithRules; break; @@ -74,18 +73,18 @@ diff -u -r1.254.4.1 Main.java default: state = error; } -@@ -3055,10 +3077,22 @@ +@@ -2789,10 +2810,22 @@ state = rulesReadyToClose; currentRuleSpecs.add(token); break; -+ case bracketClosed: -+ for (int i = bracket; i < cursor ; i++) { -+ currentClasspathName += (String) tokens.get(i); -+ } -+ state = readyToClose; -+ break; ++ case bracketClosed: ++ for (int i = bracket; i < cursor ; i++) { ++ currentClasspathName += (String) tokens.get(i); ++ } ++ state = readyToClose; ++ break; + case bracketOpened: -+ break; ++ break; default: state = error; } @@ -96,13 +95,13 @@ diff -u -r1.254.4.1 Main.java + } } switch(state) { - case readyToClose : -@@ -3066,6 +3100,8 @@ - case readyToCloseOrOtherEntry : - addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); + case readyToClose: +@@ -2801,6 +2834,8 @@ + addNewEntry(paths, currentClasspathName, currentRuleSpecs, + customEncoding, isSourceOnly); break; -+ case bracketOpened: -+ case bracketClosed: ++ case bracketOpened: ++ case bracketClosed: default : // we go on anyway this.logger.logIncorrectClasspath(currentPath); diff --git a/eclipse.spec b/eclipse.spec index d3dcbb2..18e6ab4 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -6,7 +6,7 @@ Epoch: 1 %define eclipse_major 3 %define eclipse_minor 2 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 1 +%define eclipse_micro 2 %define libname libswt3 # All arches line up between Eclipse and Linux kernel names except i386 -> x86 @@ -19,16 +19,16 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 37%{?dist} +Release: 1%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-sourceBuild-srcIncluded-3.2.1.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-sourceBuild-srcIncluded-3.2.2.zip Source2: %{name}.desktop # The icu4j bits will be moved out into their own package for Fedora 7. See: # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199504 Source7: ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar -Source11: %{name}-fedora-splash-3.2.1.png +Source11: %{name}-fedora-splash-3.2.2.png Source16: %{name}-copy-platform.sh Source17: efj.sh.in Source18: ecj.sh.in @@ -51,8 +51,6 @@ Patch3: %{name}-libupdatebuild2.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 Patch4: %{name}-swttools.patch -# This is fixed post-3.3M1 -Patch10: %{name}-helpindexbuilder.patch # This needs to go upstream Patch11: %{name}-usebuiltlauncher.patch # This does two things: @@ -72,8 +70,6 @@ Patch14: %{name}-ecj-rpmdebuginfo.patch # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html # This needs to be submitted upstream Patch15: %{name}-pde.build-add-package-build.patch -# We need to disable junit4 and apt until GCJ can handle Java5 code -Patch16: %{name}-disable-junit4-apt.patch # This tomcat stuff will change when they move to the equinox jetty provider # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 Patch6: %{name}-tomcat55.patch @@ -84,7 +80,6 @@ Patch5: %{name}-updatehomedir.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=161996 Patch9: %{name}-ecj-square-bracket-classpath.patch # Use ecj for gcj -# The patch to Main.java can go away with 3.2.2. Patch17: %{name}-ecj-gcj.patch # Build against firefox: # - fix swt profile include path @@ -202,7 +197,7 @@ Summary: Eclipse Rich Client Platform Group: Development/Languages Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release} # This file-level requirement is for the bi-arch multilib case -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar +Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.2.v3236.jar Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release} Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} %if %{gcj_support} @@ -235,7 +230,7 @@ Requires(postun): java-gcj-compat >= 1.0.64 %endif Requires: %{name}-rcp = %{epoch}:%{version}-%{release} # This file-level requirement is for the bi-arch multilib case -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar +Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.2.v3236.jar Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in @@ -380,6 +375,7 @@ to create Eclipse applications. %setup -q -c %patch0 -p0 +sed --in-place "s/java5.home/java.home/" build.xml %patch2 -p0 %patch3 -p0 # FIXME: investigate why we are pushd'ing here @@ -406,7 +402,6 @@ pushd plugins/org.eclipse.jdt.core %patch9 -p0 %patch17 -p0 popd -%patch10 -p0 %patch11 -p0 # Because the launcher source is zipped up, we need to unzip, patch, and re-pack @@ -444,17 +439,12 @@ sed --in-place "s:/usr/share/:%{_datadir}/:g" \ plugins/org.eclipse.pde.doc.user/pdeOptions \ plugins/org.eclipse.platform.doc.isv/platformOptions.txt %patch14 -p0 -pwd pushd plugins/org.eclipse.pde.build %patch15 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties popd -# Remove apt and junit4 until we have 1.5 -%patch16 -p0 -rm plugins/org.junit4/junit-4.1.jar - # Build against our firefox packages pushd plugins/org.eclipse.swt mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla @@ -705,10 +695,10 @@ popd # set the icu4j plugins for building pushd baseLocation/plugins -rm com.ibm.icu.base_3.4.5.jar \ - com.ibm.icu_3.4.5.jar \ - com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip \ - com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip +rm com.ibm.icu.base_3.4.5.20061213.jar \ + com.ibm.icu_3.4.5.20061213.jar \ + com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip \ + com.ibm.icu.source_3.4.5.20061213/src/com.ibm.icu_3.4.5.20061213/src.zip mkdir -p icu4j-build-temp pushd icu4j-build-temp @@ -774,7 +764,7 @@ rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build pushd baseLocation/plugins # Build the icu.base plugin -zipfile=$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip +zipfile=$PWD/com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip pushd icu4j-build/com.ibm.icu.base/src find -name \*.java | xargs touch --date=1/1/1980 zip -X -9 -r $zipfile . -i \*.java @@ -782,10 +772,10 @@ popd pushd icu4j-build/com.ibm.icu.base ant build.update.jar popd -mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar . +mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar com.ibm.icu.base_3.4.5.20061213.jar # Build the icu plugin -zipfile=$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip +zipfile=$PWD/com.ibm.icu.source_3.4.5.20061213/src/com.ibm.icu_3.4.5.20061213/src.zip pushd icu4j-build/com.ibm.icu/src find -name \*.java | xargs touch --date=1/1/1980 zip -X -9 -r $zipfile . -i \*.java @@ -793,7 +783,7 @@ popd pushd icu4j-build/com.ibm.icu ant build.update.jar popd -mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar . +mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar com.ibm.icu_3.4.5.20061213.jar popd @@ -871,7 +861,8 @@ export JAVA_HOME=%{java_home} ant \ -Dnobootstrap=true \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ - -Dlibsconfig=true + -Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 +# -Djava.home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre # Build the FileInitializer application SDK=$(cd eclipse && pwd) @@ -956,8 +947,8 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPD $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins # FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug. -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.4.5.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.4.5.20061213.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5.20061213 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins # FIXME: there is a problem with gjdoc generating different HTML on different # architectures. @@ -1339,9 +1330,10 @@ UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//') %ifnarch ia64 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION %else +OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//') aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \ --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar \ - --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_3.2.1.R32x_v20060919.jar + --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION %endif %endif @@ -1394,7 +1386,7 @@ fi # Only set the product back to platform.ide if the sdk is actually removed for # this arch. This SDKDIR check is to deal with the ordering of new %%post # before old %%postun -if [ -d /usr/lib/eclipse/features]; then +if [ -d /usr/lib/eclipse/features ]; then SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_") else SDKDIR="" @@ -1676,26 +1668,26 @@ fi %{_datadir}/%{name}/plugins/org.junit_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_* -#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.core_* +%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.core_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_* -#%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* -#%{_datadir}/%{name}/plugins/org.junit4_* +%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_* +%{_datadir}/%{name}/plugins/org.junit4_* %{_datadir}/%{name}/plugins/org.eclipse.jdt_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_* -#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* +%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.ui_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_* %{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_* %if %{gcj_support} +%{_libdir}/gcj/%{name}/junit-4.1.jar* %{_libdir}/gcj/%{name}/org.eclipse.ant.ui_* -#%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.core_* +%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.core_* %{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_* -#%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit4.runtime_* -#%{_libdir}/gcj/%{name}/org.junit4_* +%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit4.runtime_* %{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_* %{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_* -#%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.ui_* +%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.ui_* %{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_* %{_libdir}/gcj/%{name}/junitruntime.jar.* %{_libdir}/gcj/%{name}/junitsupport.jar.* @@ -1747,6 +1739,11 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Wed Feb 21 2007 Ben Konrath 3.2.2-1 +- 3.2.2. +- Remove patch that disables Java 5 code. +- Add -DjavacSource=1.5 -DjavacTarget=1.5 to ant compile line. + * Wed Feb 07 2007 Ben Konrath 3.2.1-37 - Move rcp feature to %%{_libdir} to avoid multilib conflict on ppc{,64}. diff --git a/sources b/sources index 8d53f1a..eaa24a6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ c3be75d8af3c31b7a1748247ab3fee95 icu4jsrc_3_4_5.jar -0fe89e9c7cf07a56c4fe8e2d7f5a394b eclipse-sourceBuild-srcIncluded-3.2.1.zip -627db0c5033547a48370a5e45a89d2f1 eclipse-fedora-splash-3.2.1.png e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 +5d1b9f6a146ffc59191e513083a6ec86 eclipse-sourceBuild-srcIncluded-3.2.2.zip +d48b18e6e50ce7713242a3e0092fdbe9 eclipse-fedora-splash-3.2.2.png