peterreilly 2005/05/31 08:53:33
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs Javadoc.java
Log:
Move javadoc backslash with space fix to ant 1.6.5
Check if file separator character is backslash before conversion
Revision Changes Path
1.836 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- WHATSNEW 30 May 2005 10:04:41 -0000 1.835
+++ WHATSNEW 31 May 2005 15:53:32 -0000 1.836
@@ -248,6 +248,9 @@
* <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
===================================
1.142 +4 -2 ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- Javadoc.java 30 Mar 2005 16:59:26 -0000 1.141
+++ Javadoc.java 31 May 2005 15:53:33 -0000 1.142
@@ -1965,8 +1965,10 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
