瀏覽代碼

Merge pull request #32 from yuriks/master

[build] Search for the git binary in the default msysgit install dir
bunnei 12 年之前
父節點
當前提交
97d47d55f3
共有 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;