]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-4219 --resolve
authorJeff Lenk <jeff@jefflenk.com>
Fri, 24 Aug 2012 13:24:18 +0000 (08:24 -0500)
committerJeff Lenk <jeff@jefflenk.com>
Fri, 24 Aug 2012 13:24:18 +0000 (08:24 -0500)
libs/win32/util.vbs

index e7815da529825a97d3055b311289b94bc9b7b01a..2c35dfdcb785b392f21ab1dfacd4952ceb584d9c 100644 (file)
@@ -375,7 +375,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
                \r
                If strLastCommit <> "" And strLastCommitHuman <> "" And strRevision <> "" Then\r
                        'Bild version string\r
-                       strGitVer = "git~" & strLastCommit & "~" & strRevision\r
+                       strGitVer = "+git~" & strLastCommit & "~" & strRevision\r
                        strVerHuman = strVerRev & "; git at commit " & strRevision & " on " & strLastCommitHuman\r
 \r
                        'Check for local changes, if found, append to git revision string\r
@@ -390,13 +390,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
                        strVerHuman = ""\r
                End If\r
 \r
-               If strVerRev = "" Then\r
-                       VERSION=strGitVer\r
-               Else\r
-                       If strGitVer <> "" Then\r
-                               VERSION=VERSION & "+" & strGitVer\r
-                       End If\r
-               End If\r
+               VERSION=VERSION & strGitVer\r
 \r
                sLastVersion = ""\r
                Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)\r