diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-16 12:36:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-16 12:36:33 +0000 |
| commit | a34d5bb6abb825b366e9b5e215266587936f9365 (patch) | |
| tree | 7602ba93143041429fc457b9cc4877377219f276 /findversion.sh | |
| parent | db7e24e211ce8c72a0ddd3a7094bf24de4777678 (diff) | |
| download | openttd-a34d5bb6abb825b366e9b5e215266587936f9365.tar.xz | |
(svn r16318) -Change: use !! instead of @@ in src/*.in too.
-Change: use @ instead of ~ in configure/Makefiles so Debian's build system(s) can also build RC binaries.
Diffstat (limited to 'findversion.sh')
| -rwxr-xr-x | findversion.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/findversion.sh b/findversion.sh index d2f0f7f1e..f9ddd1bcb 100755 --- a/findversion.sh +++ b/findversion.sh @@ -86,8 +86,8 @@ elif [ -d "$ROOT_DIR/.git" ]; then fi HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null` REV="g`echo $HASH | cut -c1-8`" - BRANCH=`git branch|grep '[*]' | sed 's~\* ~~;s~^master$~~'` - REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"` + BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'` + REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"` elif [ -d "$ROOT_DIR/.hg" ]; then # We are a hg checkout if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then @@ -95,8 +95,8 @@ elif [ -d "$ROOT_DIR/.hg" ]; then fi HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3` REV="h`echo $HASH | cut -c1-8`" - BRANCH=`hg branch | sed 's~^default$~~'` - REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"` + BRANCH=`hg branch | sed 's@^default$@@'` + REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"` else # We don't know MODIFIED="1" |