소스 검색

[build] Search for the git binary in the default msysgit install dir

The Git for Windows installer doesn't add the Git binaries to the path
by default. (Due to risk of conflicts with built-in windows commands.)
Unless you have configured your system specially this causes the
scm_rev_gen.js script to fail to find Git.  Added more paths to the
script so that it searches in the default msysgit installation
directory, eliminating the need to set the PATH for most environments.
Yuri Kunde Schlesner 12 년 전
부모
커밋
78eb8ba844
1개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 1
      src/common/scm_rev_gen.js

+ 8 - 1
src/common/scm_rev_gen.js

@@ -6,8 +6,15 @@ var cmd_revision    = " rev-parse HEAD";
 var cmd_describe    = " describe --always --long --dirty";
 var cmd_branch      = " rev-parse --abbrev-ref HEAD";
 
+var git_search_paths = {
+    "git.cmd": 1,
+    "git": 1,
+    "C:\\Program Files (x86)\\Git\\bin\\git.exe": 1,
+    "C:\\Program Files\\Git\\bin\\git.exe": 1
+};
+
 function GetGitExe() {
-    for (var gitexe in { "git.cmd": 1, "git": 1 }) {
+    for (var gitexe in git_search_paths) {
         try {
             wshShell.Exec(gitexe);
             return gitexe;