mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21351) -Change: read some metadata from (official) source tarballs so you'll more likely get the right version/revision out-of-the-box

release/1.1
rubidium 2010-11-29 12:49:27 +00:00
parent c60a850fed
commit 4aa6a24d95
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.lib
View File

@ -1020,6 +1020,9 @@ check_params() {
elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
revision="" revision=""
log 1 "checking revision... hg detection" log 1 "checking revision... hg detection"
elif [ -f "$ROOT_DIR/.rev" ]; then
revision=""
log 1 "checking revision... source tarball"
else else
revision="" revision=""
log 1 "checking revision... no detection" log 1 "checking revision... no detection"

4
findversion.sh
View File

@ -108,6 +108,10 @@ elif [ -d "$ROOT_DIR/.hg" ]; then
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$@@'`
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
# We are an exported source bundle
cat $ROOT_DIR/.ottdrev
exit
else else
# We don't know # We don't know
MODIFIED="1" MODIFIED="1"

33
projects/determineversion.vbs
View File

@ -35,8 +35,9 @@ Sub UpdateFiles(version)
If InStr(version, Chr(9)) Then If InStr(version, Chr(9)) Then
revision = Mid(version, InStr(version, Chr(9)) + 1) revision = Mid(version, InStr(version, Chr(9)) + 1)
modified = Mid(revision, InStr(revision, Chr(9)) + 1)
revision = Mid(revision, 1, InStr(revision, Chr(9)) - 1) revision = Mid(revision, 1, InStr(revision, Chr(9)) - 1)
modified = Mid(version, InStrRev(version, Chr(9)) + 1) modified = Mid(modified, 1, InStr(modified, Chr(9)) - 1)
version = Mid(version, 1, InStr(version, Chr(9)) - 1) version = Mid(version, 1, InStr(version, Chr(9)) - 1)
Else Else
revision = 0 revision = 0
@ -260,19 +261,27 @@ Function DetermineSVNVersion()
End If ' version = "norev000" End If ' version = "norev000"
End If ' version <> "norev000" End If ' version <> "norev000"
If modified = 2 Then Dim rev_file
version = version & "M" Set rev_file = FSO.OpenTextFile("../.ottdrev", 1, True, 0)
End If If Not rev_file.atEndOfStream Then
DetermineSVNVersion = rev_file.ReadLine()
If branch <> "" Then
version = version & "-" & branch
End If
If version <> "norev000" Then
DetermineSVNVersion = version & Chr(9) & revision & Chr(9) & modified
Else Else
DetermineSVNVersion = version If modified = 2 Then
version = version & "M"
End If
clean_rev = version
If branch <> "" Then
version = version & "-" & branch
End If
If version <> "norev000" Then
DetermineSVNVersion = version & Chr(9) & revision & Chr(9) & modified & Chr(9) & clean_rev
Else
DetermineSVNVersion = version
End If
End If End If
rev_file.close
End Function End Function
Function IsCachedVersion(ByVal version) Function IsCachedVersion(ByVal version)