diff options
Diffstat (limited to 'projects/determineversion.vbs')
| -rwxr-xr-x | projects/determineversion.vbs | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs index 98e4e8322..1670882fb 100755 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -35,8 +35,9 @@ Sub UpdateFiles(version) If InStr(version, Chr(9)) Then 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) - 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) Else revision = 0 @@ -260,19 +261,27 @@ Function DetermineSVNVersion() End If ' version = "norev000" End If ' version <> "norev000" - If modified = 2 Then - version = version & "M" - End If + Dim rev_file + Set rev_file = FSO.OpenTextFile("../.ottdrev", 1, True, 0) + If Not rev_file.atEndOfStream Then + DetermineSVNVersion = rev_file.ReadLine() + Else + If modified = 2 Then + version = version & "M" + End If - If branch <> "" Then - version = version & "-" & branch - 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 - Else - DetermineSVNVersion = version + If version <> "norev000" Then + DetermineSVNVersion = version & Chr(9) & revision & Chr(9) & modified & Chr(9) & clean_rev + Else + DetermineSVNVersion = version + End If End If + rev_file.close End Function Function IsCachedVersion(ByVal version) |