Browse Source

Move javadoc backslash with space fix to ant 1.6.5

Check if file separator character is backslash before conversion


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278385 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 20 years ago
parent
commit
a95fba7819
2 changed files with 7 additions and 2 deletions
  1. +3
    -0
      WHATSNEW
  2. +4
    -2
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 3
- 0
WHATSNEW View File

@@ -248,6 +248,9 @@ Fixed bugs:
* <macrodef> with redefined default values was incorrect. (Fix for
31215 had a bug). Bugzilla report 35109.

* <javadoc> will convert baskslashes to forwardslashes when generating file
list by useexternalfile. Bugzilla report 27814.

Changes from Ant 1.6.3 to Ant 1.6.4
===================================



+ 4
- 2
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -1965,8 +1965,10 @@ public class Javadoc extends Task {
if (useExternalFile) {
// XXX what is the following doing? should it run if !javadoc4 && executable != null?
if (javadoc4 && sourceFileName.indexOf(" ") > -1) {
String name =
sourceFileName.replace(File.separatorChar, '/');
String name = sourceFileName;
if (File.separatorChar == '\\') {
name = sourceFileName.replace(File.separatorChar, '/');
}
srcListWriter.println("\"" + name + "\"");
} else {
srcListWriter.println(sourceFileName);


Loading…
Cancel
Save