浏览代码

fix get-deps on win32

Juhani Rankimies 14 年前
父节点
当前提交
de716e1852
共有 2 个文件被更改,包括 9 次插入5 次删除
  1. +4
    -4
      src/rebar_deps.erl
  2. +5
    -1
      src/rebar_utils.erl

+ 4
- 4
src/rebar_deps.erl 查看文件

@ -314,12 +314,12 @@ required_scm_client_vsn(bzr) -> {2, 0};
required_scm_client_vsn(svn) -> {1, 6}.
scm_client_vsn(hg) ->
scm_client_vsn(os:find_executable(hg), " --version", "version (\\d+).(\\d+)");
scm_client_vsn(rebar_utils:find_executable(hg), " --version", "version (\\d+).(\\d+)");
scm_client_vsn(git) ->
scm_client_vsn(os:find_executable(git), " --version", "git version (\\d+).(\\d+)");
scm_client_vsn(rebar_utils:find_executable(git), " --version", "git version (\\d+).(\\d+)");
scm_client_vsn(bzr) ->
scm_client_vsn(os:find_executable(bzr), " --version", "Bazaar \\(bzr\\) (\\d+).(\\d+)");
scm_client_vsn(rebar_utils:find_executable(bzr), " --version", "Bazaar \\(bzr\\) (\\d+).(\\d+)");
scm_client_vsn(svn) ->
scm_client_vsn(os:find_executable(svn), " --version", "svn, version (\\d+).(\\d+)");
scm_client_vsn(rebar_utils:find_executable(svn), " --version", "svn, version (\\d+).(\\d+)");
scm_client_vsn(_) ->
undefined.

+ 5
- 1
src/rebar_utils.erl 查看文件

@ -38,7 +38,8 @@
beam_to_mod/2, beams/1,
erl_to_mod/1,
abort/2,
escript_foldl/3]).
escript_foldl/3,
find_executable/1]).
-include("rebar.hrl").
@ -125,6 +126,9 @@ escript_foldl(Fun, Acc, File) ->
escript:foldl(Fun, Acc, File)
end.
find_executable(Name) ->
"\"" ++ filename:nativename(os:find_executable(Name)) ++ "\"".
%% ====================================================================
%% Internal functions
%% ====================================================================

正在加载...
取消
保存