Mercurial > hg > openttd
changeset 5512:a4f44b155522 draft
(svn r7809) -Fix: convert \r to \n before parsing files with awk in projects/generate so it works using mingw/msys
author | glx <glx@openttd.org> |
---|---|
date | Wed, 03 Jan 2007 22:24:36 +0000 |
parents | f8d022ec1985 |
children | 7427a5680c21 |
files | projects/generate |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/generate +++ b/projects/generate @@ -39,7 +39,7 @@ load_main_data() { # Read the source.list and process it - RES="`awk ' + RES="`cat $1 | tr '\r' '\n' | awk ' /^( *)#end/ { if (deep == skip) { skip -= 1; } deep -= 1; next; } /^( *)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; } /^( *)#if/ { @@ -95,7 +95,7 @@ } } END { print " </Filter>"; } - ' < $1`" + '`" eval "$2=\"\$RES\"" } @@ -128,25 +128,27 @@ generate() { echo "Generating $2..." # Everything above the !!FILES!! marker - RES="`awk ' + RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk ' + /^$/ { next } /!!FILES!!/ { stop = 1; } { if (stop == 0) { print $0 } } - ' < \"$ROOT_DIR/projects/$2\".in > \"$ROOT_DIR/projects/$2\"`" + ' > \"$ROOT_DIR/projects/$2\"`" # The files-list echo "$1" >> "$ROOT_DIR/projects/$2" # Everything below the !!FILES!! marker - RES="`awk ' + RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk ' BEGIN { stop = 1; } + /^$/ { next } /!!FILES!!/ { stop = 2; } { if (stop == 0) { print $0 } if (stop == 2) { stop = 0 } } - ' < \"$ROOT_DIR/projects/$2.in\" >> \"$ROOT_DIR/projects/$2\"`" + ' >> \"$ROOT_DIR/projects/$2\"`" } load_main_data "$ROOT_DIR/source.list" openttd