Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r7809) -Fix: convert \r to \n before parsing files with awk in projects/generate so it works using mingw/msys

Browse Source
This commit is contained in:
glx 2007-01-03 22:24:36 +00:00
parent ac410d6f65
commit 9930b9890f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
projects/generate
View File

@ -39,7 +39,7 @@ file_prefix="..\\\\src\\\\"
load_main_data() { load_main_data() {
# Read the source.list and process it # 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; } /^( *)#end/ { if (deep == skip) { skip -= 1; } deep -= 1; next; }
/^( *)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; } /^( *)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
/^( *)#if/ { /^( *)#if/ {
@ -95,7 +95,7 @@ load_main_data() {
} }
} }
END { print " </Filter>"; } END { print " </Filter>"; }
' < $1`" '`"
eval "$2=\"\$RES\"" eval "$2=\"\$RES\""
} }
@ -128,25 +128,27 @@ load_lang_data() {
generate() { generate() {
echo "Generating $2..." echo "Generating $2..."
# Everything above the !!FILES!! marker # Everything above the !!FILES!! marker
RES="`awk ' RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk '
/^$/ { next }
/!!FILES!!/ { stop = 1; } /!!FILES!!/ { stop = 1; }
{ {
if (stop == 0) { print $0 } if (stop == 0) { print $0 }
} }
' < \"$ROOT_DIR/projects/$2\".in > \"$ROOT_DIR/projects/$2\"`" ' > \"$ROOT_DIR/projects/$2\"`"
# The files-list # The files-list
echo "$1" >> "$ROOT_DIR/projects/$2" echo "$1" >> "$ROOT_DIR/projects/$2"
# Everything below the !!FILES!! marker # Everything below the !!FILES!! marker
RES="`awk ' RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk '
BEGIN { stop = 1; } BEGIN { stop = 1; }
/^$/ { next }
/!!FILES!!/ { stop = 2; } /!!FILES!!/ { stop = 2; }
{ {
if (stop == 0) { print $0 } if (stop == 0) { print $0 }
if (stop == 2) { stop = 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 load_main_data "$ROOT_DIR/source.list" openttd