diff options
| author | 2014-07-21 10:51:51 -0400 | |
|---|---|---|
| committer | 2014-07-21 10:51:51 -0400 | |
| commit | 97d47d55f3a47f29856e48e611846021fde1c850 (patch) | |
| tree | a96a631d651a595219902a0bcc8a23f20d5c2993 | |
| parent | Merge pull request #33 from lioncash/redefs (diff) | |
| parent | [build] Search for the git binary in the default msysgit install dir (diff) | |
| download | yuzu-97d47d55f3a47f29856e48e611846021fde1c850.tar.gz yuzu-97d47d55f3a47f29856e48e611846021fde1c850.tar.xz yuzu-97d47d55f3a47f29856e48e611846021fde1c850.zip | |
Merge pull request #32 from yuriks/master
[build] Search for the git binary in the default msysgit install dir
Diffstat (limited to '')
| -rw-r--r-- | src/common/scm_rev_gen.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/common/scm_rev_gen.js b/src/common/scm_rev_gen.js index 29c913b85..98313e376 100644 --- a/src/common/scm_rev_gen.js +++ b/src/common/scm_rev_gen.js | |||
| @@ -6,8 +6,15 @@ var cmd_revision = " rev-parse HEAD"; | |||
| 6 | var cmd_describe = " describe --always --long --dirty"; | 6 | var cmd_describe = " describe --always --long --dirty"; |
| 7 | var cmd_branch = " rev-parse --abbrev-ref HEAD"; | 7 | var cmd_branch = " rev-parse --abbrev-ref HEAD"; |
| 8 | 8 | ||
| 9 | var git_search_paths = { | ||
| 10 | "git.cmd": 1, | ||
| 11 | "git": 1, | ||
| 12 | "C:\\Program Files (x86)\\Git\\bin\\git.exe": 1, | ||
| 13 | "C:\\Program Files\\Git\\bin\\git.exe": 1 | ||
| 14 | }; | ||
| 15 | |||
| 9 | function GetGitExe() { | 16 | function GetGitExe() { |
| 10 | for (var gitexe in { "git.cmd": 1, "git": 1 }) { | 17 | for (var gitexe in git_search_paths) { |
| 11 | try { | 18 | try { |
| 12 | wshShell.Exec(gitexe); | 19 | wshShell.Exec(gitexe); |
| 13 | return gitexe; | 20 | return gitexe; |