Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 90178 invoked from network); 12 Dec 2002 15:15:47 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 12 Dec 2002 15:15:47 -0000 Received: (qmail 12302 invoked by uid 97); 12 Dec 2002 15:16:33 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 12216 invoked by uid 97); 12 Dec 2002 15:16:32 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 12162 invoked by uid 98); 12 Dec 2002 15:16:31 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Subject: [PATCH] enhancement to fixcrlf From: Martin van den Bemt To: ant-dev@jakarta.apache.org Content-Type: multipart/mixed; boundary="=-uRuEZtXIrShkzEurCndm" X-Mailer: Ximian Evolution 1.0.5 Date: 12 Dec 2002 16:15:13 +0100 Message-Id: <1039706114.5999.4690.camel@swami> Mime-Version: 1.0 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --=-uRuEZtXIrShkzEurCndm Content-Type: text/plain Content-Transfer-Encoding: 7bit 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 --=-uRuEZtXIrShkzEurCndm Content-Disposition: attachment; filename=crlf.diff Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=crlf.diff; charset=ISO-8859-1 Index: docs/manual/CoreTasks/fixcrlf.html=0D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0D RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/fixcrlf.html,v=0D retrieving revision 1.11=0D diff -u -r1.11 fixcrlf.html=0D --- docs/manual/CoreTasks/fixcrlf.html 22 Jun 2002 23:38:27 -0000 1.11=0D +++ docs/manual/CoreTasks/fixcrlf.html 12 Dec 2002 15:10:59 -0000=0D @@ -100,6 +100,9 @@=0D
  • cr: convert all EOLs to a single CR
    • =0D
  • lf: convert all EOLs to a single LF
    • =0D
  • crlf: convert all EOLs to the pair CRLF
    • =0D +
  • mac: convert all EOLs to a single CR
    • =0D +
  • unix: convert all EOLs to a single LF
    • =0D +
  • windows: convert all EOLs to the pair CRLF
    • =0D =0D Default is based on the platform on which you are running=0D this task. For Unix platforms, the default is "lf".=0D Index: src/main/org/apache/tools/ant/taskdefs/FixCRLF.java=0D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0D RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixC= RLF.java,v=0D retrieving revision 1.42=0D diff -u -r1.42 FixCRLF.java=0D --- src/main/org/apache/tools/ant/taskdefs/FixCRLF.java 8 Nov 2002 14:59:46= -0000 1.42=0D +++ src/main/org/apache/tools/ant/taskdefs/FixCRLF.java 12 Dec 2002 15:11:0= 2 -0000=0D @@ -226,10 +226,10 @@=0D String option =3D attr.getValue();=0D if (option.equals("asis")) {=0D eol =3D ASIS;=0D - } else if (option.equals("cr")) {=0D + } else if (option.equals("cr") || option.equals("mac")) {=0D eol =3D CR;=0D eolstr =3D "\r";=0D - } else if (option.equals("lf")) {=0D + } else if (option.equals("lf") || option.equals("unix")) {=0D eol =3D LF;=0D eolstr =3D "\n";=0D } else {=0D --=-uRuEZtXIrShkzEurCndm Content-Type: text/plain; charset=us-ascii -- To unsubscribe, e-mail: For additional commands, e-mail: --=-uRuEZtXIrShkzEurCndm--