Hi everyone,

Added mac, unix and windows to the line-ending options. (they just
resolve to cr, lf and crlf, added it there for convnenience

Mvgr,
Martin



Index: docs/manual/CoreTasks/fixcrlf.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/fixcrlf.html,v
retrieving revision 1.11
diff -u -r1.11 fixcrlf.html
--- docs/manual/CoreTasks/fixcrlf.html	22 Jun 2002 23:38:27 -0000	1.11
+++ docs/manual/CoreTasks/fixcrlf.html	12 Dec 2002 15:10:59 -0000
@@ -100,6 +100,9 @@
 	      <li>cr: convert all EOLs to a single CR</li>
 	      <li>lf: convert all EOLs to a single LF</li>
 	      <li>crlf: convert all EOLs to the pair CRLF</li>
+	      <li>mac: convert all EOLs to a single CR</li>
+	      <li>unix: convert all EOLs to a single LF</li>
+	      <li>windows: convert all EOLs to the pair CRLF</li>
 	    </ul>
 	    Default is based on the platform on which you are running
 	    this task.  For Unix platforms, the default is &quot;lf&quot;.
Index: src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.42
diff -u -r1.42 FixCRLF.java
--- src/main/org/apache/tools/ant/taskdefs/FixCRLF.java	8 Nov 2002 14:59:46 -0000	1.42
+++ src/main/org/apache/tools/ant/taskdefs/FixCRLF.java	12 Dec 2002 15:11:02 -0000
@@ -226,10 +226,10 @@
         String option = attr.getValue();
         if (option.equals("asis")) {
             eol = ASIS;
-        } else if (option.equals("cr")) {
+        } else if (option.equals("cr") || option.equals("mac")) {
             eol = CR;
             eolstr = "\r";
-        } else if (option.equals("lf")) {
+        } else if (option.equals("lf") || option.equals("unix")) {
             eol = LF;
             eolstr = "\n";
         } else {

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to