mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-10 11:50:53 +00:00
FS-4219 --resolve
This commit is contained in:
1 parent
fbc83cb0ea
commit
72d67cdbd8
1 file changed
+2
-8
+2
-8
@@ -375,7 +375,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
|
|||||||
|
|
||||||
If strLastCommit <> "" And strLastCommitHuman <> "" And strRevision <> "" Then
|
If strLastCommit <> "" And strLastCommitHuman <> "" And strRevision <> "" Then
|
||||||
'Bild version string
|
'Bild version string
|
||||||
strGitVer = "git~" & strLastCommit & "~" & strRevision
|
strGitVer = "+git~" & strLastCommit & "~" & strRevision
|
||||||
strVerHuman = strVerRev & "; git at commit " & strRevision & " on " & strLastCommitHuman
|
strVerHuman = strVerRev & "; git at commit " & strRevision & " on " & strLastCommitHuman
|
||||||
|
|
||||||
'Check for local changes, if found, append to git revision string
|
'Check for local changes, if found, append to git revision string
|
||||||
@@ -390,13 +390,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
|
|||||||
strVerHuman = ""
|
strVerHuman = ""
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If strVerRev = "" Then
|
VERSION=VERSION & strGitVer
|
||||||
VERSION=strGitVer
|
|
||||||
Else
|
|
||||||
If strGitVer <> "" Then
|
|
||||||
VERSION=VERSION & "+" & strGitVer
|
|
||||||
End If
|
|
||||||
End If
|
|
||||||
|
|
||||||
sLastVersion = ""
|
sLastVersion = ""
|
||||||
Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)
|
Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)
|
||||||
|
|||||||
Reference in new issue
Block a user