25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00

Add 'gitonly_deps' list to rebar config/script (#3391)

Add list of dependencies that should only be built from git, to support
building with rebar3 where deps do not have hex packages (or where the
package versions do not directly map to git tags).

This is required for elixir and luerl deps.
This commit is contained in:
Stu Tomlinson 2020-09-21 12:49:58 +01:00 committed by GitHub
parent b89f3c442c
commit d9feed54a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions

View File

@ -61,6 +61,8 @@
{yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.7"}}} {yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.7"}}}
]}. ]}.
{gitonly_deps, [elixir, luerl]}.
{if_var_true, latest_deps, {if_var_true, latest_deps,
{floating_deps, [cache_tab, {floating_deps, [cache_tab,
eimp, eimp,

View File

@ -196,9 +196,14 @@ AppendList2 = fun(Append) ->
end, end,
Rebar3DepsFilter = Rebar3DepsFilter =
fun(DepsList) -> fun(DepsList, GitOnlyDeps) ->
lists:map(fun({DepName, _, {git, _, {tag, Version}}}) -> lists:map(fun({DepName, _, {git, _, {tag, Version}}} = Dep) ->
{DepName, Version}; case lists:member(DepName, GitOnlyDeps) of
true ->
Dep;
_ ->
{DepName, Version}
end;
(Dep) -> (Dep) ->
Dep Dep
end, DepsList) end, DepsList)
@ -367,8 +372,8 @@ Rules = [
AppendList2(ProcssXrefExclusions), [], []}, AppendList2(ProcssXrefExclusions), [], []},
{[deps], [floating_deps], true, {[deps], [floating_deps], true,
ProcessFloatingDeps, [], []}, ProcessFloatingDeps, [], []},
{[deps], IsRebar3, {[deps], [gitonly_deps], IsRebar3,
Rebar3DepsFilter, []}, Rebar3DepsFilter, [], []},
{[deps], SystemDeps /= false, {[deps], SystemDeps /= false,
GlobalDepsFilter, []} GlobalDepsFilter, []}
], ],