From 30702c17b648d75a03e8d7a37e61a7f6db6509d6 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 29 Apr 2015 22:17:53 +0000 Subject: [PATCH] [windows] When making scmrev.h, also look for msysgit explicitly. VS2015 packages it. --- Source/Core/Common/make_scmrev.h.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 97c68cc923..1d5fa902f4 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -28,6 +28,17 @@ function GetGitExe() {} } + // last try - msysgit not in path (vs2015 default) + msyspath = "\\Git\\cmd\\git.exe"; + gitexe = wshShell.ExpandEnvironmentStrings("%PROGRAMFILES(x86)%") + msyspath; + if (oFS.FileExists(gitexe)) { + return gitexe; + } + gitexe = wshShell.ExpandEnvironmentStrings("%PROGRAMFILES%") + msyspath; + if (oFS.FileExists(gitexe)) { + return gitexe; + } + WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" + wshShell.ExpandEnvironmentStrings("%PATH%")); WScript.Quit(1);