mirror of
https://github.com/correl/rebar.git
synced 2024-11-23 11:09:55 +00:00
Remove alt_url support in favor of new features
This commit is contained in:
parent
e6d5a494b0
commit
32ddef7158
3 changed files with 3 additions and 22 deletions
|
@ -12,8 +12,7 @@ _rebar()
|
|||
ct doc delete-deps eunit get-deps generate generate-upgrade \
|
||||
help list-deps list-templates update-deps version xref overlay \
|
||||
apps= case= force=1 jobs= suites= verbose=1 appid= previous_release= \
|
||||
nodeid= root_dir= skip_deps=true skip_apps= template= template_dir= \
|
||||
alt_urls=true"
|
||||
nodeid= root_dir= skip_deps=true skip_apps= template= template_dir="
|
||||
|
||||
if [[ ${cur} == --* ]] ; then
|
||||
COMPREPLY=( $(compgen -W "${lopts}" -- ${cur}) )
|
||||
|
|
|
@ -115,10 +115,7 @@
|
|||
{deps, [application_name,
|
||||
{application_name, "1.0.*"},
|
||||
{application_name, "1.0.*",
|
||||
{git, "git://github.com/basho/rebar.git", {branch, "master"}}},
|
||||
{application_name, "1.0.*",
|
||||
{git, "git://github.com/basho/rebar.git", {branch, "master"}},
|
||||
[{alt_url, "https://github.com/basho/rebar.git"}]}]}.
|
||||
{git, "git://github.com/basho/rebar.git", {branch, "master"}}}]}.
|
||||
|
||||
%% == Subdirectories ==
|
||||
|
||||
|
|
|
@ -229,30 +229,15 @@ find_deps(Mode, [App | Rest], Acc) when is_atom(App) ->
|
|||
find_deps(Mode, [{App, VsnRegex} | Rest], Acc) when is_atom(App) ->
|
||||
find_deps(Mode, [{App, VsnRegex, undefined} | Rest], Acc);
|
||||
find_deps(Mode, [{App, VsnRegex, Source} | Rest], Acc) ->
|
||||
find_deps(Mode, [{App, VsnRegex, Source, []} | Rest], Acc);
|
||||
find_deps(Mode, [{App, VsnRegex, Source, Opts} | Rest], Acc) ->
|
||||
Dep = #dep { app = App,
|
||||
vsn_regex = VsnRegex,
|
||||
source = get_source(Source, Opts) },
|
||||
source = Source },
|
||||
{Availability, FoundDir} = find_dep(Dep),
|
||||
find_deps(Mode, Rest, acc_deps(Mode, Availability, Dep, FoundDir, Acc));
|
||||
find_deps(_Mode, [Other | _Rest], _Acc) ->
|
||||
?ABORT("Invalid dependency specification ~p in ~s\n",
|
||||
[Other, rebar_utils:get_cwd()]).
|
||||
|
||||
get_source(undefined, _Opts) ->
|
||||
undefined;
|
||||
get_source(Source, Opts) ->
|
||||
setelement(2, Source, dep_url(element(2, Source), Opts)).
|
||||
|
||||
dep_url(Url, Opts) ->
|
||||
case rebar_config:get_global(alt_urls, "false") of
|
||||
"true" ->
|
||||
proplists:get_value(alt_url, Opts, Url);
|
||||
"false" ->
|
||||
Url
|
||||
end.
|
||||
|
||||
find_dep(Dep) ->
|
||||
%% Find a dep based on its source,
|
||||
%% e.g. {git, "https://github.com/mochi/mochiweb.git", "HEAD"}
|
||||
|
|
Loading…
Reference in a new issue