dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21840) -Change: Support tags created by hgsubversion for the revision detection.

Browse Source
This commit is contained in:
michi_cc
2011-01-18 21:27:35 +00:00
parent b0a592a649
commit 2f98ad38ba
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
findversion.sh
View File

@@ -112,6 +112,11 @@ elif [ -d "$ROOT_DIR/.hg" ]; then
HASH=`LC_ALL=C hg id -i | cut -c1-12` HASH=`LC_ALL=C hg id -i | cut -c1-12`
REV="h`echo $HASH | cut -c1-8`" REV="h`echo $HASH | cut -c1-8`"
BRANCH=`hg branch | sed 's@^default$@@'` BRANCH=`hg branch | sed 's@^default$@@'`
TAG=`hg id -t`
if [ -n "$TAG" ] && [ $TAG != "tip" ]; then
BRANCH=""
REV=$TAG
fi
REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc}\n" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"` REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc}\n" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
elif [ -f "$ROOT_DIR/.ottdrev" ]; then elif [ -f "$ROOT_DIR/.ottdrev" ]; then
# We are an exported source bundle # We are an exported source bundle

17
projects/determineversion.vbs
View File

@@ -237,7 +237,7 @@ Function DetermineSVNVersion()
If version = "norev000" Then If version = "norev000" Then
' git detection failed, reset error and try mercurial (hg) ' git detection failed, reset error and try mercurial (hg)
Err.Clear Err.Clear
Set oExec = WshShell.Exec("hg parents") Set oExec = WshShell.Exec("hg id -i")
If Err.Number = 0 Then If Err.Number = 0 Then
' Wait till the application is finished ... ' Wait till the application is finished ...
Do While oExec.Status = 0 Do While oExec.Status = 0
@@ -245,8 +245,21 @@ Function DetermineSVNVersion()
If oExec.ExitCode = 0 Then If oExec.ExitCode = 0 Then
line = OExec.StdOut.ReadLine() line = OExec.StdOut.ReadLine()
hash = Mid(line, InStrRev(line, ":") + 1) hash = Left(line, 12)
version = "h" & Mid(hash, 1, 8) version = "h" & Mid(hash, 1, 8)
' Check if a tag is currently checked out
Err.Clear
Set oExec = WshShell.Exec("hg id -t")
If Err.Number = 0 Then
line = oExec.StdOut.ReadLine()
If Len(line) > 0 And line <> "tip" Then
version = line
branch = ""
End If ' Len(line) > 0 And line <> "tip"
End If ' Err.Number = 0
Err.Clear
Set oExec = WshShell.Exec("hg status ../") Set oExec = WshShell.Exec("hg status ../")
If Err.Number = 0 Then If Err.Number = 0 Then
Do Do