Add version check to support git and svn

diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs
index 934a3ec1a54becf54b75a5c16a807c93635a0e8b..395632bf478ac750b364b3191b22a2886c88c951 100644 (file)
--- a/libs/win32/util.vbs
+++ b/libs/win32/util.vbs
@@ -308,23 +308,44 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
        Const ForReading       =  1\r
 \r
        if strVerRev = "" Then\r
-           VersionCmd="fs_svnversion " & quote & VersionDir & "." & quote &  " -n"\r
-           Set MyFile = fso.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)\r
-           MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote )\r
-           MyFile.WriteLine("@" & VersionCmd)\r
-           MyFile.Close\r
-           Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote)\r
-           Do\r
-                   strFromProc = OExec.StdOut.ReadLine()\r
-                   VERSION=strFromProc\r
-           Loop While Not OExec.StdOut.atEndOfStream\r
-           sLastVersion = ""\r
-           Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)\r
-           If Not sLastFile.atEndOfStream Then\r
-                   sLastVersion = sLastFile.ReadLine()\r
-           End If\r
-           sLastFile.Close\r
-    End If\r
+               if FSO.FolderExists(VersionDir & ".svn") Then\r
+                       VersionCmd="fs_svnversion " & quote & VersionDir & "." & quote &  " -n"\r
+                       Set MyFile = fso.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)\r
+                       MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote )\r
+                       MyFile.WriteLine("@" & VersionCmd)\r
+                       MyFile.Close\r
+                       Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote)\r
+                       Do\r
+                               strFromProc = OExec.StdOut.ReadLine()\r
+                               VERSION="svn-" & strFromProc\r
+                       Loop While Not OExec.StdOut.atEndOfStream\r
+                       sLastVersion = ""\r
+                       Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)\r
+                       If Not sLastFile.atEndOfStream Then\r
+                               sLastVersion = sLastFile.ReadLine()\r
+                       End If\r
+                       sLastFile.Close\r
+               End If\r
+\r
+               if FSO.FolderExists(VersionDir & ".git") Then\r
+                       VersionCmd="git log --format=" & quote & "%%h %%ci" & quote & " -1 HEAD"\r
+                       Set MyFile = FSO.CreateTextFile(tmpFolder & "tmpVersion.Bat", True)\r
+                       MyFile.WriteLine("@" & "cd " & quote & VersionDir & quote)\r
+                       MyFile.WriteLine("@" & VersionCmd)\r
+                       MyFile.Close\r
+                       Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote)\r
+                       Do\r
+                               strFromProc = Trim(OExec.StdOut.ReadLine())\r
+                               VERSION="git-" & strFromProc\r
+                       Loop While Not OExec.StdOut.atEndOfStream\r
+                       sLastVersion = ""\r
+                       Set sLastFile = FSO.OpenTextFile(tmpFolder & "lastversion", ForReading, true, OpenAsASCII)\r
+                       If Not sLastFile.atEndOfStream Then\r
+                               sLastVersion = sLastFile.ReadLine()\r
+                       End If\r
+                       sLastFile.Close\r
+               End If\r
+       End If\r
        \r
        if strVerRev <> "" Then\r
            VERSION = strVerRev\r