peterreilly 2005/05/31 08:54:13
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Javadoc.java
Log:
sync bug 27814
Revision Changes Path
No revision
No revision
1.503.2.234 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.233
retrieving revision 1.503.2.234
diff -u -r1.503.2.233 -r1.503.2.234
--- WHATSNEW 30 May 2005 20:47:20 -0000 1.503.2.233
+++ WHATSNEW 31 May 2005 15:54:13 -0000 1.503.2.234
@@ -13,6 +13,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
===================================
No revision
No revision
1.124.2.9 +5 -1 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.124.2.8
retrieving revision 1.124.2.9
diff -u -r1.124.2.8 -r1.124.2.9
--- Javadoc.java 30 Mar 2005 16:56:19 -0000 1.124.2.8
+++ Javadoc.java 31 May 2005 15:54:13 -0000 1.124.2.9
@@ -1905,7 +1905,11 @@
String sourceFileName = sf.getFile().getAbsolutePath();
if (useExternalFile) {
if (javadoc4 && sourceFileName.indexOf(" ") > -1) {
- srcListWriter.println("\"" + sourceFileName + "\"");
+ 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]
