aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-02-18 16:52:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-02-18 16:52:26 +0200
commitf80809f490dd8ab4b52a996a027d0f64446bc98f (patch)
tree21ae750bece485c10b3338c23e87f25e3e41f58b
parent602c19c85d7fa74646fe1891c7fd1f81088e0248 (diff)
Use todos/fromdos instead of deprecated dos2unix/unix2dos
-rwxr-xr-xbuild/meta/vc10proj2
-rwxr-xr-xbuild/meta/vc9proj2
-rwxr-xr-xbuild/meta/vcsln10
-rwxr-xr-xbuild/meta/vctest4
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 \
'/^[ ]*<Configuration$/{n;s/[ ]*Name="\([^"]*\)"$/"\1",/p};d' -`
conf=`echo $conf | sed -e 's/,$//'`
else
- conf=`cat $f | dos2unix | sed -n -e \
+ conf=`cat $f | fromdos | sed -n -e \
's/^[ ]*<ProjectConfiguration Include="\([^"]*\)">$/"\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>{\([^}]*\)}<\/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;\