From 74bf4b0f2e38cf47aa12bfd3eb3fec7e4400782c Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 15 Apr 2010 23:00:29 -0500
Subject: [PATCH] Add version check to support git and svn

---
 libs/win32/util.vbs | 55 +++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 17 deletions(-)

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