From 97c2188812ee3aa9b6480d412e20ecb71740bc0b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jul 2006 10:56:19 +0200 Subject: Makefile.am: Avoid duplicate symbol errors on Netware mwldnlm, mwccnlm, mwasmnlm: Filter garbage characters from output netware/BUILD/mwasmnlm: Filter garbage characters from output netware/BUILD/mwccnlm: Filter garbage characters from output netware/BUILD/mwldnlm: Filter garbage characters from output tests/Makefile.am: Avoid duplicate symbol errors on Netware --- netware/BUILD/mwasmnlm | 2 +- netware/BUILD/mwccnlm | 2 +- netware/BUILD/mwldnlm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'netware/BUILD') diff --git a/netware/BUILD/mwasmnlm b/netware/BUILD/mwasmnlm index 381f84ec0c8..7f2378871c6 100755 --- a/netware/BUILD/mwasmnlm +++ b/netware/BUILD/mwasmnlm @@ -5,4 +5,4 @@ set -e args=" $*" -wine --debugmsg -all -- mwasmnlm $args +wine --debugmsg -all -- mwasmnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//' diff --git a/netware/BUILD/mwccnlm b/netware/BUILD/mwccnlm index cb2d62fe8cf..44cbe810922 100755 --- a/netware/BUILD/mwccnlm +++ b/netware/BUILD/mwccnlm @@ -7,4 +7,4 @@ set -e # convert it to "-I../include" args=" "`echo $* | sed -e 's/-I.\/../-I../g'` -wine --debugmsg -all -- mwccnlm $args +wine --debugmsg -all -- mwccnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//' diff --git a/netware/BUILD/mwldnlm b/netware/BUILD/mwldnlm index 28566fc5cb1..08df0e69e12 100755 --- a/netware/BUILD/mwldnlm +++ b/netware/BUILD/mwldnlm @@ -5,4 +5,4 @@ set -e args=" $*" -wine --debugmsg -all -- mwldnlm $args +wine --debugmsg -all -- mwldnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//' -- cgit v1.2.1 From 9ecc01a9e37cae5087eb4fd5baa96bf8e693d3a9 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Jul 2006 16:44:17 +0200 Subject: mwldnlm, mwccnlm, mwasmnlm: Use Perl for filtering, do more filtering netware/BUILD/mwasmnlm: Use Perl for filtering, do more filtering netware/BUILD/mwccnlm: Use Perl for filtering, do more filtering netware/BUILD/mwldnlm: Use Perl for filtering, do more filtering --- netware/BUILD/mwasmnlm | 5 ++++- netware/BUILD/mwccnlm | 5 ++++- netware/BUILD/mwldnlm | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'netware/BUILD') diff --git a/netware/BUILD/mwasmnlm b/netware/BUILD/mwasmnlm index 7f2378871c6..11fc2bc3842 100755 --- a/netware/BUILD/mwasmnlm +++ b/netware/BUILD/mwasmnlm @@ -5,4 +5,7 @@ set -e args=" $*" -wine --debugmsg -all -- mwasmnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//' +# NOTE: Option 'pipefail' is not standard sh +set -o pipefail +wine --debugmsg -all -- mwasmnlm $args | \ +perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g' diff --git a/netware/BUILD/mwccnlm b/netware/BUILD/mwccnlm index 44cbe810922..e6840e781f8 100755 --- a/netware/BUILD/mwccnlm +++ b/netware/BUILD/mwccnlm @@ -7,4 +7,7 @@ set -e # convert it to "-I../include" args=" "`echo $* | sed -e 's/-I.\/../-I../g'` -wine --debugmsg -all -- mwccnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//' +# NOTE: Option 'pipefail' is not standard sh +set -o pipefail +wine --debugmsg -all -- mwccnlm $args | \ +perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g' diff --git a/netware/BUILD/mwldnlm b/netware/BUILD/mwldnlm index 08df0e69e12..cc8c9e63c6e 100755 --- a/netware/BUILD/mwldnlm +++ b/netware/BUILD/mwldnlm @@ -5,4 +5,7 @@ set -e args=" $*" -wine --debugmsg -all -- mwldnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//' +# NOTE: Option 'pipefail' is not standard sh +set -o pipefail +wine --debugmsg -all -- mwldnlm $args | \ +perl -pe 's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g' -- cgit v1.2.1