提交 a065cf86 authored 作者: Jeff Lenk's avatar Jeff Lenk

FS-4219 --resolve correct windows version

上级 e4caea6f
...@@ -271,14 +271,15 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest) ...@@ -271,14 +271,15 @@ 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 strVerRev = "" Then
If FSO.FolderExists(VersionDir & ".git") Then If FSO.FolderExists(VersionDir & ".git") Then
VersionCmd="git log --format=" & quote & "%%h %%ci" & quote & " -1 HEAD" VersionCmd="git log --format=" & quote & "%%h %%ci" & quote & " -1 HEAD"
Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpVersion.Bat", True) Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)
...@@ -298,9 +299,10 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest) ...@@ -298,9 +299,10 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
sLastFile.Close sLastFile.Close
VERSION = Replace(VERSION, ":", "-") VERSION = Replace(VERSION, ":", "-")
End If 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
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论