Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org Received: (qmail 93465 invoked by uid 500); 11 Mar 2001 20:35:31 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk Reply-To: ant-dev@jakarta.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 93456 invoked from network); 11 Mar 2001 20:35:30 -0000 X-My-Real-Login-Name: hnakamur; ms-mc.neweb.ne.jp MIME-Version: 1.0 X-Mailer: Denshin 8 Go V32.1.3.1 Date: Mon, 12 Mar 2001 05:35:40 +0900 From: Hiroaki Nakamura To: ant-dev@jakarta.apache.org Subject: [PATCH] add lf attribute to FixCRLF task Content-Type: multipart/mixed; boundary="Den8_3aabe177fc1a" Content-Description: "Mail with base64 encoded attachment" Message-Id: <20010311203532.UMLM1133.imfep03.kcom.ne.jp@ic060> X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N --Den8_3aabe177fc1a Content-Type: text/plain; charset=iso-2022-jp Here is a patch for adding the lf attribute to the FixCRLF task. With this patch, you can change newlines among CR+LF (DOS), LF (Unix), CR (Macintosh). I hope this patch will be included. Thank you. -- )Hiroaki Nakamura) hnakamur@mc.neweb.ne.jp --Den8_3aabe177fc1a Content-Type: application/octet-stream; name="fixcrlf.html.diff" Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename="fixcrlf.html.diff" LS0tIGRvY3MvbWFudWFsL0NvcmVUYXNrcy9maXhjcmxmLmh0bWwub3JpZwlUdWUgRmViIDEzIDEy OjMxOjUyIDIwMDENCisrKyBkb2NzL21hbnVhbC9Db3JlVGFza3MvZml4Y3JsZi5odG1sCVN1biBN YXIgMTEgMjA6MjI6MTggMjAwMQ0KQEAgLTkxLDYgKzkxLDM1IEBADQogICAgIDx0ZCB2YWxpZ249 InRvcCIgYWxpZ249ImNlbnRlciI+Tm88L3RkPg0KICAgPC90cj4NCiAgIDx0cj4NCisgICAgPHRk IHZhbGlnbj0idG9wIj5sZjwvdGQ+DQorICAgIDx0ZCB2YWxpZ249InRvcCI+U3BlY2lmaWVzIGhv dyBsaW5lIGZlZWQgKExGKSBjaGFyYWN0ZXJzIGFyZSB0bw0KKyAgICAgIGJlIGhhbmRsZWQuICBW YWxpZCB2YWx1ZXMgZm9yIHRoaXMgcHJvcGVydHkgYXJlOg0KKyAgICAgIDx1bD4NCisgICAgICA8 bGk+YWRkOiBlbnN1cmUgdGhhdCB0aGVyZSBpcyBhIExGIGFmdGVyIGV2ZXJ5IENSDQorICAgICAg PGxpPmFzaXM6IGxlYXZlIExGIGNoYXJhY3RlcnMgYWxvbmUNCisgICAgICA8bGk+cmVtb3ZlOiBy ZW1vdmUgYWxsIExGIGNoYXJhY3RlcnMNCisgICAgICA8L3VsPg0KKyAgICAgIERlZmF1bHQgaXMg YXNpcy4gIFdoZW4geW91IHNldCB0aGlzIHByb3BlcnR5LCB5b3Ugc2hvdWxkIGV4cGxpY2l0bHkg c2V0DQorICAgICAgdGhlIGNyIHByb3BlcnR5LiAgVmFsaWQgdmFsdWVzIGZvciB0aGUgY3IgcHJv cGVydHkgYW5kIHRoaXMgcHJvcGVydHkgYXJlOg0KKyAgICAgIDxkbD4NCisgICAgICA8ZHQ+RG8g bm90aGluZzxkZD5jcj0mcXVvdDthc2lzJnF1b3Q7IGxmPSZxdW90O2FzaXMmcXVvdDsNCisgICAg ICA8ZHQ+RE9TIC0mZ3Q7IFVuaXg8ZGQ+Y3I9JnF1b3Q7cmVtb3ZlJnF1b3Q7IGxmPSZxdW90O2Fz aXMmcXVvdDsNCisgICAgICA8ZHQ+RE9TICZsdDstIFVuaXg8ZGQ+Y3I9JnF1b3Q7YWRkJnF1b3Q7 IGxmPSZxdW90O2FzaXMmcXVvdDsNCisgICAgICA8ZHQ+TWFjaW50b3NoIC0mZ3Q7IFVuaXg8ZGQ+ Y3I9JnF1b3Q7cmVtb3ZlJnF1b3Q7IGxmPSZxdW90O2FkZCZxdW90Ow0KKyAgICAgIDxkdD5NYWNp bnRvc2ggJmx0Oy0gVW5peDxkZD5jcj0mcXVvdDthZGQmcXVvdDsgbGY9JnF1b3Q7cmVtb3ZlJnF1 b3Q7DQorICAgICAgPGR0Pk1hY2ludG9zaCAtJmd0OyBET1M8ZGQ+Y3I9JnF1b3Q7YXNpcyZxdW90 OyBsZj0mcXVvdDthZGQmcXVvdDsNCisgICAgICA8ZHQ+TWFjaW50b3NoICZsdDstIERPUzxkZD5j cj0mcXVvdDthc2lzJnF1b3Q7IGxmPSZxdW90O3JlbW92ZSZxdW90Ow0KKyAgICAgIDwvZGw+DQor ICAgICAgPHA+DQorICAgICAgTm90ZTogY3IgYW5kIGxmIGNhbm5vdCBzaW11bHRhbmVvdXNseSBi ZSAmcXVvdDthZGQmcXVvdDsgb3INCisgICAgICAmcXVvdDtyZW1vdmUmcXVvdDsuDQorICAgICAg PHA+DQorICAgICAgTm90ZTogVW5sZXNzIHRoaXMgcHJvcGVydHkgaXMgc3BlY2lmaWVkIGFzICZx dW90O2FzaXMmcXVvdDssIGV4dHJhIExGIGNoYXJhY3RlcnMNCisgICAgICB3aGljaCBkbyBub3Qg Zm9sbG93IGEgQ1Igd2lsbCBiZSByZW1vdmVkLg0KKyAgICAgIDwvdGQ+DQorICAgIDx0ZCB2YWxp Z249InRvcCIgYWxpZ249ImNlbnRlciI+Tm88L3RkPg0KKyAgPC90cj4NCisgIDx0cj4NCiAgICAg PHRkIHZhbGlnbj0idG9wIj50YWI8L3RkPg0KICAgICA8dGQgdmFsaWduPSJ0b3AiPlNwZWNpZmll cyBob3cgdGFiIGNoYXJhY3RlcnMgYXJlIHRvIGJlIGhhbmRsZWQuICBWYWxpZA0KICAgICAgIHZh bHVlcyBmb3IgdGhpcyBwcm9wZXJ0eSBhcmU6DQo= --Den8_3aabe177fc1a Content-Type: application/octet-stream; name="FixCRLF.java.diff" Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename="FixCRLF.java.diff" LS0tIHNyYy9tYWluL29yZy9hcGFjaGUvdG9vbHMvYW50L3Rhc2tkZWZzL0ZpeENSTEYuamF2YS5v cmlnCVdlZCBKYW4gMDMgMTQ6MTg6MzAgMjAwMQ0KKysrIHNyYy9tYWluL29yZy9hcGFjaGUvdG9v bHMvYW50L3Rhc2tkZWZzL0ZpeENSTEYuamF2YQlTdW4gTWFyIDExIDE5OjUyOjUwIDIwMDENCkBA IC03NSw2ICs3NSw3IEBADQogICogPGxpPmluY2x1ZGUNCiAgKiA8bGk+ZXhjbHVkZQ0KICAqIDxs aT5jcg0KKyAqIDxsaT5sZg0KICAqIDxsaT50YWINCiAgKiA8bGk+ZW9mDQogICogPC91bD4NCkBA IC05Niw2ICs5Nyw3IEBADQogcHVibGljIGNsYXNzIEZpeENSTEYgZXh0ZW5kcyBNYXRjaGluZ1Rh c2sgew0KIA0KICAgICBwcml2YXRlIGludCBhZGRjcjsgICAgICAvLyBjcjogIC0xID0+IHJlbW92 ZSwgMCA9PiBhc2lzLCArMSA9PiBhZGQNCisgICAgcHJpdmF0ZSBpbnQgYWRkbGY7ICAgICAgLy8g bGY6ICAtMSA9PiByZW1vdmUsIDAgPT4gYXNpcywgKzEgPT4gYWRkDQogICAgIHByaXZhdGUgaW50 IGFkZHRhYjsgICAgIC8vIHRhYjogLTEgPT4gcmVtb3ZlLCAwID0+IGFzaXMsICsxID0+IGFkZA0K ICAgICBwcml2YXRlIGludCBjdHJsejsgICAgICAvLyBlb2Y6IC0xID0+IHJlbW92ZSwgMCA9PiBh c2lzLCArMSA9PiBhZGQNCiAgICAgcHJpdmF0ZSBpbnQgdGFibGVuZ3RoID0gODsgIC8vIGxlbmd0 aCBvZiB0YWIgaW4gc3BhY2VzDQpAQCAtMTU2LDYgKzE1OCwyOCBAQA0KICAgICB9DQogDQogICAg IC8qKg0KKyAgICAgKiBTcGVjaWZ5IGhvdyBsaW5lIGZlZWQgKExGKSBjaGFyYXRlcnMgYXJlIHRv IGJlIGhhbmRsZWQNCisgICAgICoNCisgICAgICogQHBhcmFtIG9wdGlvbiB2YWxpZCB2YWx1ZXM6 DQorICAgICAqIDx1bD4NCisgICAgICogPGxpPmFkZDogZW5zdXJlIHRoYXQgdGhlcmUgaXMgYSBM RiBhZnRlciBldmVyeSBDUg0KKyAgICAgKiA8bGk+YXNpczogbGVhdmUgTEYgY2hhcmFjdGVycyBh bG9uZQ0KKyAgICAgKiA8bGk+cmVtb3ZlOiByZW1vdmUgYWxsIExGIGNoYXJhY3RlcnMNCisgICAg ICogPC91bD4NCisgICAgICovDQorICAgIHB1YmxpYyB2b2lkIHNldExmKEFkZEFzaXNSZW1vdmUg YXR0cikgew0KKyAgICAgICAgU3RyaW5nIG9wdGlvbiA9IGF0dHIuZ2V0VmFsdWUoKTsNCisgICAg ICAgIGlmIChvcHRpb24uZXF1YWxzKCJyZW1vdmUiKSkgew0KKyAgICAgICAgICAgIGFkZGxmID0g LTE7DQorICAgICAgICB9IGVsc2UgaWYgKG9wdGlvbi5lcXVhbHMoImFzaXMiKSkgew0KKyAgICAg ICAgICAgIGFkZGxmID0gMDsNCisgICAgICAgIH0gZWxzZSB7DQorICAgICAgICAgICAgLy8gbXVz dCBiZSAiYWRkIg0KKyAgICAgICAgICAgIGFkZGxmID0gKzE7DQorICAgICAgICB9DQorICAgIH0N CisNCisgICAgLyoqDQogICAgICAqIFNwZWNpZnkgaG93IHRhYiBjaGFyYXRlcnMgYXJlIHRvIGJl IGhhbmRsZWQNCiAgICAgICoNCiAgICAgICogQHBhcmFtIG9wdGlvbiB2YWxpZCB2YWx1ZXM6DQpA QCAtMjM1LDEwICsyNTksMTQgQEANCiAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEJ1aWxkRXhj ZXB0aW9uKCJkZXN0ZGlyIGlzIG5vdCBhIGRpcmVjdG9yeSEiKTsNCiAgICAgICAgICAgICB9DQog ICAgICAgICB9DQorICAgICAgICBpZiAoKGFkZGNyID09ICsxICYmIGFkZGxmID09ICsxKSB8fCAo YWRkY3IgPT0gLTEgJiYgYWRkbGYgPT0gLTEpKSB7DQorICAgICAgICAgICAgdGhyb3cgbmV3IEJ1 aWxkRXhjZXB0aW9uKCJjciBhbmQgbGYgY2Fubm90IHNpbXVsdGFuZW91c2x5IGJlIFwiYWRkXCIg b3IgXCJyZW1vdmVcIiEiKTsNCisgICAgICAgIH0NCiANCiAgICAgICAgIC8vIGxvZyBvcHRpb25z IHVzZWQNCiAgICAgICAgIGxvZygib3B0aW9uczoiICsNCiAgICAgICAgICAgICAiIGNyPSIgKyAo YWRkY3I9PS0xID8gImFkZCIgOiBhZGRjcj09MCA/ICJhc2lzIiA6ICJyZW1vdmUiKSArDQorICAg ICAgICAgICAgIiBsZj0iICsgKGFkZGxmPT0tMSA/ICJhZGQiIDogYWRkbGY9PTAgPyAiYXNpcyIg OiAicmVtb3ZlIikgKw0KICAgICAgICAgICAgICIgdGFiPSIgKyAoYWRkdGFiPT0tMSA/ICJhZGQi IDogYWRkdGFiPT0wID8gImFzaXMiIDogInJlbW92ZSIpICsNCiAgICAgICAgICAgICAiIGVvZj0i ICsgKGN0cmx6PT0tMSA/ICJhZGQiIDogY3RybHo9PTAgPyAiYXNpcyIgOiAicmVtb3ZlIikgKw0K ICAgICAgICAgICAgICIgdGFibGVuZ3RoPSIgKyB0YWJsZW5ndGgsDQpAQCAtMjg1LDYgKzMxMyw4 IEBADQogICAgICAgICAgICAgaW50IG91dHNpemUgPSBjb3VudDsNCiAgICAgICAgICAgICBpZiAo YWRkY3IgICE9ICAwKSBvdXRzaXplLT1jcjsNCiAgICAgICAgICAgICBpZiAoYWRkY3IgID09ICsx KSBvdXRzaXplKz1sZjsNCisgICAgICAgICAgICBpZiAoYWRkbGYgICE9ICAwKSBvdXRzaXplLT1s ZjsNCisgICAgICAgICAgICBpZiAoYWRkbGYgID09ICsxKSBvdXRzaXplKz1jcjsNCiAgICAgICAg ICAgICBpZiAoYWRkdGFiID09IC0xKSBvdXRzaXplKz10YWIqKHRhYmxlbmd0aC0xKTsNCiAgICAg ICAgICAgICBpZiAoY3RybHogID09ICsxKSBvdXRzaXplKz0xOw0KIA0KQEAgLTMxOSwxMiArMzQ5 LDE3IEBADQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dGRhdGFbbysrXT0oYnl0ZSkn XHInOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb2wrKzsNCiAgICAgICAgICAgICAg ICAgICAgICAgICB9DQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGFkZGxmID09ICsxKSB7 DQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dGRhdGFbbysrXT0oYnl0ZSknXG4nOw0K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaW5lPW87DQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbD0wOw0KKyAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAg ICAgICAgICAgICAgICBicmVhazsNCiANCiAgICAgICAgICAgICAgICAgICAgIGNhc2UgKGJ5dGUp J1xuJzoNCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBzdGFydCBhIG5ldyBsaW5lIChvcHRp b25hbCBDUiBmb2xsb3dlZCBieSBMRikNCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYWRk Y3IgPT0gKzEpIG91dGRhdGFbbysrXT0oYnl0ZSknXHInOw0KLSAgICAgICAgICAgICAgICAgICAg ICAgIG91dGRhdGFbbysrXT0oYnl0ZSknXG4nOw0KKyAgICAgICAgICAgICAgICAgICAgICAgIGlm IChhZGRsZiA9PSAgMCkgb3V0ZGF0YVtvKytdPShieXRlKSdcbic7DQogICAgICAgICAgICAgICAg ICAgICAgICAgbGluZT1vOw0KICAgICAgICAgICAgICAgICAgICAgICAgIGNvbD0wOw0KICAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOw0K --Den8_3aabe177fc1a Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: ant-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: ant-dev-help@jakarta.apache.org --Den8_3aabe177fc1a--