From fd9d9f7589d01c4c1046d7b2a117b76e40bd4c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sat, 23 May 2015 23:18:51 +0300 Subject: Handle rebar3-style deps --- core/deps.mk | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'core/deps.mk') diff --git a/core/deps.mk b/core/deps.mk index 64fa9e6..d032fbb 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -190,16 +190,22 @@ define dep_autopatch_rebar.erl File = case lists:keyfind(deps, 1, Conf) of false -> []; {_, Deps} -> - [begin - Name = element(1, Dep), - {Method, Repo, Commit} = case element(3, Dep) of - {git, R} -> {git, R, master}; - {M, R, {branch, C}} -> {M, R, C}; - {M, R, {tag, C}} -> {M, R, C}; - {M, R, C} -> {M, R, C} - end, - Write(io_lib:format("DEPS += ~s\ndep_~s = ~s ~s ~s~n", [Name, Name, Method, Repo, Commit])) - end || Dep <- Deps, tuple_size(Dep) > 2] + [begin case case Dep of + {N, S} when is_tuple(S) -> {N, S}; + {N, _, S} -> {N, S}; + {N, _, S, _} -> {N, S}; + _ -> false + end of + false -> ok; + {Name, Source} -> + {Method, Repo, Commit} = case Source of + {git, R} -> {git, R, master}; + {M, R, {branch, C}} -> {M, R, C}; + {M, R, {tag, C}} -> {M, R, C}; + {M, R, C} -> {M, R, C} + end, + Write(io_lib:format("DEPS += ~s\ndep_~s = ~s ~s ~s~n", [Name, Name, Method, Repo, Commit])) + end end || Dep <- Deps] end end(), fun() -> -- cgit v1.2.3