Просмотр исходного кода

pass deps dir of project to relx

pull/3/head
Tristan Sloughter 10 лет назад
Родитель
Сommit
26192b2187
2 измененных файлов: 6 добавлений и 4 удалений
  1. +3
    -2
      src/rebar_prv_release.erl
  2. +3
    -2
      src/rebar_prv_tar.erl

+ 3
- 2
src/rebar_prv_release.erl Просмотреть файл

@ -33,13 +33,14 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) -> do(State) ->
Options = rebar_state:command_args(State), Options = rebar_state:command_args(State),
DepsDir = rebar_prv_install_deps:get_deps_dir(State),
AllOptions = string:join(["release" | Options], " "), AllOptions = string:join(["release" | Options], " "),
try try
case rebar_state:get(State, relx, []) of case rebar_state:get(State, relx, []) of
[] -> [] ->
relx:main(AllOptions);
relx:main([{lib_dirs, [DepsDir]}], AllOptions);
Config -> Config ->
relx:main([{config, Config}], AllOptions)
relx:main([{lib_dirs, [DepsDir]}, {config, Config}], AllOptions)
end, end,
{ok, State} {ok, State}
catch catch

+ 3
- 2
src/rebar_prv_tar.erl Просмотреть файл

@ -33,12 +33,13 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) -> do(State) ->
Options = rebar_state:command_args(State), Options = rebar_state:command_args(State),
DepsDir = rebar_prv_install_deps:get_deps_dir(State),
AllOptions = string:join(["release", "tar" | Options], " "), AllOptions = string:join(["release", "tar" | Options], " "),
case rebar_state:get(State, relx, []) of case rebar_state:get(State, relx, []) of
[] -> [] ->
relx:main(AllOptions);
relx:main([{lib_dirs, [DepsDir]}], AllOptions);
Config -> Config ->
relx:main([{config, Config}], AllOptions)
relx:main([{lib_dirs, [DepsDir]}, {config, Config}], AllOptions)
end, end,
{ok, State}. {ok, State}.

Загрузка…
Отмена
Сохранить