kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

FS-4219 --resolve correct windows version

Browse Source
This commit is contained in:
Jeff Lenk 2012-06-05 08:44:22 -05:00
parent e4caea6ffd
commit a065cf8631
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/win32/util.vbs
View File

@ -271,36 +271,38 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
strVerRev = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION") strVerRev = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION")
'Set version to the one reported by configure.in 'Set version to the one reported by configure.in
if strVerRev <> "" Then If strVerRev <> "" Then
VERSION = strVerRev VERSION = strVerRev
End If End If
Dim sLastFile Dim sLastFile
Const ForReading = 1 Const ForReading = 1
'Try To read revision from git, if it's found, use this instead of strVerRev found above 'Try To read revision from git, if it was not found in "configure.in" already
If FSO.FolderExists(VersionDir & ".git") Then If strVerRev = "" Then
VersionCmd="git log --format=" & quote & "%%h %%ci" & quote & " -1 HEAD" If FSO.FolderExists(VersionDir & ".git") Then
Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpVersion.Bat", True) VersionCmd="git log --format=" & quote & "%%h %%ci" & quote & " -1 HEAD"
MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote) Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)
MyFile.WriteLine("@" & VersionCmd) MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote)
MyFile.Close MyFile.WriteLine("@" & VersionCmd)
Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) MyFile.Close
Do Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote)
strFromProc = Trim(OExec.StdOut.ReadLine()) Do
VERSION="git-" & strFromProc strFromProc = Trim(OExec.StdOut.ReadLine())
Loop While Not OExec.StdOut.atEndOfStream VERSION="git-" & strFromProc
sLastVersion = "" Loop While Not OExec.StdOut.atEndOfStream
Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII) sLastVersion = ""
If Not sLastFile.atEndOfStream Then Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)
sLastVersion = sLastFile.ReadLine() If Not sLastFile.atEndOfStream Then
sLastVersion = sLastFile.ReadLine()
End If
sLastFile.Close
VERSION = Replace(VERSION, ":", "-")
End If End If
sLastFile.Close
VERSION = Replace(VERSION, ":", "-")
End If End If
If VERSION = "" Then If VERSION = "" Then
VERSION = "UNKNOWN" VERSION = "-UNKNOWN"
End If End If
If VERSION <> sLastVersion Then If VERSION <> sLastVersion Then