bodewig 2005/03/14 02:43:29
Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional Tag:
ANT_16_BRANCH Cab.java
Log:
merge
Revision Changes Path
No revision
No revision
1.1.2.33 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- CONTRIBUTORS 14 Mar 2005 09:19:29 -0000 1.1.2.32
+++ CONTRIBUTORS 14 Mar 2005 10:43:28 -0000 1.1.2.33
@@ -88,6 +88,7 @@
Jason Salter
Jason Yip
Jay Dickon Glanville
+Jay Peck
Jay van der Meer
JC Mann
J D Glanville
1.503.2.194 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.193
retrieving revision 1.503.2.194
diff -u -r1.503.2.193 -r1.503.2.194
--- WHATSNEW 14 Mar 2005 09:19:29 -0000 1.503.2.193
+++ WHATSNEW 14 Mar 2005 10:43:28 -0000 1.503.2.194
@@ -247,6 +247,9 @@
* The framed JUnit report now handles multiple reports for the same
testcase properly. Bugzilla Report 32745.
+* <cab> didn't work for files with spaces in their names on Windows.
+ Bugzilla Report 17182.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
No revision
No revision
1.29.2.6 +7 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.29.2.5
retrieving revision 1.29.2.6
diff -u -r1.29.2.5 -r1.29.2.6
--- Cab.java 9 Mar 2004 17:01:41 -0000 1.29.2.5
+++ Cab.java 14 Mar 2005 10:43:29 -0000 1.29.2.6
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -149,6 +149,9 @@
/**
* Creates a list file. This temporary file contains a list of all files
* to be included in the cab, one file per line.
+ *
+ * <p>This method expects to only be called on Windows and thus
+ * quotes the file names.</p>
*/
protected File createListFile(Vector files)
throws IOException {
@@ -157,8 +160,9 @@
PrintWriter writer = new PrintWriter(new FileOutputStream(listFile));
- for (int i = 0; i < files.size(); i++) {
- writer.println(files.elementAt(i).toString());
+ int size = files.size();
+ for (int i = 0; i < size; i++) {
+ writer.println('\"' + files.elementAt(i).toString() + '\"');
}
writer.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
|