Author: mbenson
Date: Thu May 18 07:35:52 2006
New Revision: 407562
URL: http://svn.apache.org/viewvc?rev=407562&view=rev
Log:
<fixcrlf> used \r (Mac) line endings on OS X, whose proper line separator
is \n (Unix). Bugzilla report 39585.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=407562&r1=407561&r2=407562&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu May 18 07:35:52 2006
@@ -85,7 +85,10 @@
* Metamata (maudit, mmetrics, and mparse tasks) removed.
-* Sitraka (jpcoverage, jpcovmerge, jpcovreport) tasks suppressed.
+* Sitraka (jpcoverage, jpcovmerge, jpcovreport) tasks suppressed.
+
+* <fixcrlf> used \r (Mac) line endings on OS X, whose proper line separator
+ is \n (Unix). Bugzilla report 39585.
Fixed bugs:
-----------
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java?rev=407562&r1=407561&r2=407562&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java Thu
May 18 07:35:52 2006
@@ -38,15 +38,15 @@
* None of which are required.
* <p>
* This version generalises the handling of EOL characters, and allows for
- * CR-only line endings (which I suspect is the standard on Macs.) Tab handling
- * has also been generalised to accommodate any tabwidth from 2 to 80,
+ * CR-only line endings (the standard on Mac systems prior to OS X). Tab
+ * handling has also been generalised to accommodate any tabwidth from 2 to 80,
* inclusive. Importantly, it can leave untouched any literal TAB characters
* embedded within Java string or character constants.
* <p>
* <em>Caution:</em> run with care on carefully formatted files. This may
* sound obvious, but if you don't specify asis, presume that your files are
* going to be modified. If "tabs" is "add" or "remove", whitespace characters
- * may be added or removed as necessary. Similarly, for EOL's - eol="asis"
+ * may be added or removed as necessary. Similarly, for EOLs, eol="asis"
* actually means convert to your native O/S EOL convention while eol="crlf" or
* cr="add" can result in CR characters being removed in one special case
* accommodated, i.e., CRCRLF is regarded as a single EOL to handle cases where
@@ -109,7 +109,7 @@
// class's constructor.
{
tabs = AddAsisRemove.ASIS;
- if (Os.isFamily("mac")) {
+ if (Os.isFamily("mac") && !Os.isFamily("unix")) {
ctrlz = AddAsisRemove.REMOVE;
setEol(CrLf.MAC);
} else if (Os.isFamily("dos")) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java?rev=407562&r1=407561&r2=407562&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Thu May
18 07:35:52 2006
@@ -59,7 +59,7 @@
* and exclude properties.
* <p>
* This version generalises the handling of EOL characters, and allows
- * for CR-only line endings (which I suspect is the standard on Macs.)
+ * for CR-only line endings (the standard on Mac systems prior to OS X).
* Tab handling has also been generalised to accommodate any tabwidth
* from 2 to 80, inclusive. Importantly, it will leave untouched any
* literal TAB characters embedded within string or character constants.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
