Attachment 4212 Details for Bug 35237 – Patch to fix this issue

[patch] Patch to fix this issue

patch_for_35237.txt (text/plain), 3.05 KB, created by Olivier Thomann

on 2003-03-18 13:14:00 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2003-03-18 13:14:00 EST

Size: 3.05 KB

patch

obsolete

>Index: antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java,v
>retrieving revision 1.17
>diff -u -r1.17 JDTCompilerAdapter.java
>--- antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java	11 Mar 2003 15:03:56 -0000	1.17
>+++ antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java	18 Mar 2003 18:08:30 -0000
>@@ -41,7 +41,8 @@
>  * @since 2.0
>  */
> public class JDTCompilerAdapter extends DefaultCompilerAdapter {
>-	private static String compilerClass = "org.eclipse.jdt.internal.compiler.batch.Main"; //$NON-NLS-1$
>+	private static String compilerClass = "org.eclipse.jdt.internal.compiler.batch.Main"; String logFileName;
>+	//$NON-NLS-1$
> 	/**
> 	 * Performs a compile using the JDT batch compiler 
> 	 */
>@@ -55,7 +56,11 @@
> 			Object batchCompilerInstance = batchCompilerConstructor.newInstance(new Object[] {new PrintWriter(System.out), new PrintWriter(System.err), new Boolean(true)});
> 			Method compile = c.getMethod("compile", new Class[] {String[].class}); //$NON-NLS-1$
> 			Object result = compile.invoke(batchCompilerInstance, new Object[] { cmd.getArguments()});
>-			return ((Boolean) result).booleanValue();
>+			final boolean resultValue = ((Boolean) result).booleanValue();
>+			if (!resultValue && verbose) {
>+				System.out.println(Util.bind("ant.jdtadapter.error.compilationFailed", this.logFileName));
>+			}
>+			return resultValue;
> 		} catch (ClassNotFoundException cnfe) {
> 			throw new BuildException(Util.bind("ant.jdtadapter.error.missingJDTCompiler")); //$NON-NLS-1$
> 		} catch (Exception ex) {
>@@ -232,7 +237,8 @@
> 			 * extra option allowed by the Eclipse compiler
> 			 */
> 			cmd.createArgument().setValue("-log"); //$NON-NLS-1$
>-			cmd.createArgument().setValue(destDir.getAbsolutePath() + ".log"); //$NON-NLS-1$
>+			logFileName = destDir.getAbsolutePath() + ".log";
>+			cmd.createArgument().setValue(logFileName); //$NON-NLS-1$
> 		}
> 
> 		/*
>Index: model/org/eclipse/jdt/internal/core/messages.properties
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/messages.properties,v
>retrieving revision 1.79
>diff -u -r1.79 messages.properties
>--- model/org/eclipse/jdt/internal/core/messages.properties	13 Mar 2003 17:33:07 -0000	1.79
>+++ model/org/eclipse/jdt/internal/core/messages.properties	18 Mar 2003 18:08:34 -0000
>@@ -229,3 +229,4 @@
> ant.jdtadapter.error.missingJRELIB = Cannot bind the JRE_LIB variable. To solve this problem, you can either set the JRE_LIB variable or use the bootclasspath parameter in your ant javac task
> ant.jdtadapter.error.ignoringMemoryInitialSize= Since fork is false, ignoring memoryInitialSize setting
> ant.jdtadapter.error.ignoringMemoryMaximumSize= Since fork is false, ignoring memoryMaximumSize setting
>+ant.jdtadapter.error.compilationFailed = Compilation failed. Compiler errors are available in {0}
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 35237: 4212