diff options
| author | michi_cc <michi_cc@openttd.org> | 2011-05-07 15:13:52 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2011-05-07 15:13:52 +0000 |
| commit | 28067c21d5cc155f72c85374f8463bf8ceb1f0a0 (patch) | |
| tree | 760377805d9c30946a9b54905508801790b56478 | |
| parent | 6cbc7be92bd90e80baf9cd4715319cf4ac7dfe7d (diff) | |
| download | openttd-28067c21d5cc155f72c85374f8463bf8ceb1f0a0.tar.xz | |
(svn r22435) -Fix: Git revision detection would return too much when tags are involved.
| -rwxr-xr-x | findversion.sh | 2 | ||||
| -rwxr-xr-x | projects/determineversion.vbs | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/findversion.sh b/findversion.sh index e83a6c0bf..35568de0c 100755 --- a/findversion.sh +++ b/findversion.sh @@ -99,7 +99,7 @@ elif [ -d "$ROOT_DIR/.git" ]; then # No rev? Maybe it is a custom git-svn clone REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"` fi - TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null`" + TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`" if [ -n "$TAG" ]; then BRANCH="" REV="$TAG" diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs index 8a991b40e..e16da751d 100755 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -227,6 +227,9 @@ Function DetermineSVNVersion() Loop If oExec.ExitCode = 0 Then version = oExec.StdOut.ReadLine() + If Right(version, 2) = "^0" Then + version = Left(version, Len(version) - 2) + End If branch = "" End If ' oExec.ExitCode = 0 End If ' Err.Number = 0 |