diff options
| author | glx <glx@openttd.org> | 2007-02-28 23:52:04 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-02-28 23:52:04 +0000 |
| commit | 3dc71e3484564a5a6546749ecf61d63d0de65879 (patch) | |
| tree | fd9f4d1581856bc16b6c098a568e2c281be18905 /projects | |
| parent | 469fbc912c2f8b502f683362a86f86d0aa991751 (diff) | |
| download | openttd-3dc71e3484564a5a6546749ecf61d63d0de65879.tar.xz | |
(svn r8948) -Change: some sed implementations have problems with \n so rewrite r8832 using awk
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/generate | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/projects/generate b/projects/generate index 841495885..f0fbbda2f 100755 --- a/projects/generate +++ b/projects/generate @@ -130,27 +130,33 @@ load_lang_data() { generate() { echo "Generating $2..." # Everything above the !!FILES!! marker - RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk ' + cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk ' /^$/ { next } /!!FILES!!/ { stop = 1; } { if (stop == 0) { print $0 } } - ' > \"$ROOT_DIR/projects/$2\"`" + ' > "$ROOT_DIR/projects/$2" # The files-list - if [ "$3" = "msvc2003" ]; then - echo "$1" | sed 's@\
\
@\n@' >> "$ROOT_DIR/projects/$2" - else - echo "$1" | sed ' - s@Filter="">@>@; - s@^\([ ]*\)\([^ <].*[^/]\)>$@\1\2\n\1>@g; - s@^ \([ ]*\)\([^ <].*\)/>$@ \1\2\n\1/>@g; - ' >> "$ROOT_DIR/projects/$2" - fi + echo "$1" | awk -v type="$3" ' + /
/ { + if (type == "msvc2003") gsub("
", "\n", $0); + } + /Filter="">/ { + if (type == "msvc2005") gsub("Filter=\"\">", ">", $0); + } + /"\/>/ { + if (type == "msvc2005") gsub("/>", "\n" substr($0, 1, index($0, $1) - 2) "/>", $0); + } + /">/ { + if (type == "msvc2005") gsub(">", "\n" substr($0, 1, index($0, $1) - 1) ">", $0); + } + { print $0 } + ' >> "$ROOT_DIR/projects/$2" # Everything below the !!FILES!! marker - RES="`cat \"$ROOT_DIR/projects/$2\".in | tr '\r' '\n' | awk ' + cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk ' BEGIN { stop = 1; } /^$/ { next } /!!FILES!!/ { stop = 2; } @@ -158,7 +164,7 @@ generate() { if (stop == 0) { print $0 } if (stop == 2) { stop = 0 } } - ' >> \"$ROOT_DIR/projects/$2\"`" + ' >> "$ROOT_DIR/projects/$2" } load_main_data "$ROOT_DIR/source.list" openttd |