From f80809f490dd8ab4b52a996a027d0f64446bc98f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 18 Feb 2011 16:52:26 +0200 Subject: Use todos/fromdos instead of deprecated dos2unix/unix2dos --- build/meta/vc10proj | 2 +- build/meta/vc9proj | 2 +- build/meta/vcsln | 10 +++++----- build/meta/vctest | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/meta/vc10proj b/build/meta/vc10proj index 7722ff7..7230681 100755 --- a/build/meta/vc10proj +++ b/build/meta/vc10proj @@ -49,7 +49,7 @@ if [ "$output" = "" ]; then fi m4=m4 -u2d=unix2dos +u2d=todos # Assume this script is never found via PATH. # diff --git a/build/meta/vc9proj b/build/meta/vc9proj index a2fbb1b..d211ea2 100755 --- a/build/meta/vc9proj +++ b/build/meta/vc9proj @@ -49,7 +49,7 @@ if [ "$output" = "" ]; then fi m4=m4 -u2d=unix2dos +u2d=todos # Assume this script is never found via PATH. # diff --git a/build/meta/vcsln b/build/meta/vcsln index 8914a96..525b99e 100755 --- a/build/meta/vcsln +++ b/build/meta/vcsln @@ -82,7 +82,7 @@ if [ "$vcver" = "" ]; then fi m4=m4 -u2d=unix2dos +u2d=todos # Assume this script is never found via PATH. # @@ -135,21 +135,21 @@ for f in $proj_files; do if [ "$conf" = "" ]; then if [ "$vcver" = "9" ]; then - conf=`cat $f | dos2unix | sed -n -e \ + conf=`cat $f | fromdos | sed -n -e \ '/^[ ]*$/"\1",/p;d' -` conf=`echo $conf | sed -e 's/,$//'` fi fi if [ "$vcver" = "9" ]; then - uuid=`cat $f | dos2unix | sed -n -e \ + uuid=`cat $f | fromdos | sed -n -e \ 's/^[ ]*ProjectGUID="{\([^}]*\)}"$/\1/p;d'` else - uuid=`cat $f | dos2unix | sed -n -e \ + uuid=`cat $f | fromdos | sed -n -e \ 's/^[ ]*{\([^}]*\)}<\/ProjectGuid>$/\1/p;d'` fi diff --git a/build/meta/vctest b/build/meta/vctest index d20af27..42c3338 100755 --- a/build/meta/vctest +++ b/build/meta/vctest @@ -84,7 +84,7 @@ fi m4=m4 -u2d=unix2dos +u2d=todos # Assume this script is never found via PATH. # @@ -107,7 +107,7 @@ fi # Determine possible configurations. # for f in $sln; do - sln_conf=`cat $f | dos2unix | sed -n -e \ + sln_conf=`cat $f | fromdos | sed -n -e \ '/^[ ]*GlobalSection(SolutionConfigurationPlatforms).*$/{\ : loop;\ n;\ -- cgit v1.1