Attachment 19064 Details for Bug 40852 – patch for Ant 165

[patch] patch for Ant 165

diff.txt (text/plain), 3.87 KB, created by Daniel Ribagnac on 2006-11-01 06:56:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Ribagnac

Created: 2006-11-01 06:56:05 UTC

Size: 3.87 KB

patch

obsolete

>--- Javadoc.java.orig	Wed Nov 01 13:24:49 2006
>+++ Javadoc.java	Wed Nov 01 13:26:00 2006
>@@ -1870,7 +1870,9 @@ public class Javadoc extends Task {
>         }
> 
>         File tmpList = null;
>+        File optionsTmpList = null;
>         PrintWriter srcListWriter = null;
>+        PrintWriter optionsListWriter = null;
>         try {
> 
>             /**
>@@ -1878,6 +1880,59 @@ public class Javadoc extends Task {
>              * if requested.
>              */
>             if (useExternalFile) {
>+                /**
>+                 * Write all options, except sourcefiles and packages name to a temporary
>+                 * file if requested
>+                 * Works only for JDK1.4+ as javadoc from JDK1.3 handles only file or package names
>+                 * http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/javadoc.html#argumentfile
>+                 */
>+                if ((optionsTmpList == null) && javadoc4) {
>+                    optionsTmpList = fileUtils.createTempFile("javadocOptions", "", null);
>+                    optionsTmpList.deleteOnExit();
>+                    
>+                    String[] listOpt = toExecute.getArguments();
>+                    toExecute.clearArgs();
>+                    toExecute.createArgument()
>+                        .setValue("@" + optionsTmpList.getAbsolutePath());
>+                    
>+                    optionsListWriter = new PrintWriter(
>+                            new FileWriter(optionsTmpList.getAbsolutePath(),
>+                                           true));
>+                    
>+                    // Treat all options
>+                    for (int i = 0; i < listOpt.length; i++) {
>+                        String string = listOpt[i];
>+                        
>+                        // Avoid -J option
>+                        // http://java.sun.com/j2se/1.4.2/docs/tooldocs/solaris/javadoc.html#argumentfiles
>+                        if (string.startsWith("-J-")) {
>+                            toExecute.createArgument().setValue(string);
>+                        } else  {
>+                            if (string.startsWith("-")) {
>+                                optionsListWriter.println();
>+                                optionsListWriter.print(string);
>+                            } else {
>+                                // Handle spaces in directory names
>+                                if (string.indexOf(' ') != -1
>+                                        && string.indexOf('\'') == -1) {
>+                                        optionsListWriter.print(
>+                                            "'" + string.replace('\\', '/') + "'");
>+                                    } else if (string.indexOf(' ') != -1) {
>+                                        optionsListWriter.print(
>+                                            "\"" + string.replace('\\', '/') + "\"");
>+                                    } else {
>+                                        optionsListWriter.print(string);
>+                                    }
>+                            }
>+                            optionsListWriter.print(" ");
>+                        }
>+                    }                   
>+                }
>+                
>+                /**
>+                 * Write sourcefiles and package names to a temporary file
>+                 * if requested.
>+                 */
>                 if (tmpList == null) {
>                     tmpList = fileUtils.createTempFile("javadoc", "", null);
>                     tmpList.deleteOnExit();
>@@ -1925,6 +1980,11 @@ public class Javadoc extends Task {
>         } finally {
>             if (srcListWriter != null) {
>                 srcListWriter.close();
>+            }
>+            
>+            // Flush file
>+            if (optionsListWriter != null) {
>+                optionsListWriter.close();
>             }
>         }
>

Actions: View | Diff

Attachments on bug 40852: 19060 | 19064 | 19067