projects/determineversion.vbs
changeset 7975 d8f22e2ece0c
parent 7917 e6b7897c5a00
child 8702 4488c1576a68
equal deleted inserted replaced
7974:dfe3185a62d2 7975:d8f22e2ece0c
   125 		End If
   125 		End If
   126 	Else
   126 	Else
   127 		' svn detection failed, reset error and try git
   127 		' svn detection failed, reset error and try git
   128 		Err.Clear
   128 		Err.Clear
   129 		Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
   129 		Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
   130 		Do While oExec.Status = 0 And Err.Number = 0
   130 		If Err.Number = 0 Then
   131 			' Wait till command has finished
       
   132 		Loop
       
   133 		If Err.Number = 0 And oExec.ExitCode = 0 Then
       
   134 			version = "g" & oExec.StdOut.ReadLine()
   131 			version = "g" & oExec.StdOut.ReadLine()
   135 			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
   132 			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
   136 			Do While oExec.Status = 0 And Err.Number = 0
   133 			Do While oExec.Status = 0 And Err.Number = 0
   137 			Loop
   134 			Loop
   138 			If Err.Number = 0 And oExec.ExitCode = 1 Then
   135 			If Err.Number = 0 And oExec.ExitCode = 1 Then