Browse Source

move back to single command with arguments for comamnd after it

pull/3/head
Tristan Sloughter 10 years ago
parent
commit
2880e2838b
8 changed files with 16 additions and 18 deletions
  1. +3
    -3
      src/rebar.erl
  2. +3
    -3
      src/rebar_core.erl
  3. +0
    -1
      src/rebar_deps.erl
  4. +2
    -3
      src/rebar_erlydtl_compiler.erl
  5. +0
    -1
      src/rebar_escripter.erl
  6. +5
    -3
      src/rebar_provider.erl
  7. +2
    -3
      src/rebar_prv_app_builder.erl
  8. +1
    -1
      src/rebar_shell.erl

+ 3
- 3
src/rebar.erl View File

@ -166,15 +166,15 @@ run_aux(BaseConfig, Commands) ->
{error,{already_started,crypto}} -> ok {error,{already_started,crypto}} -> ok
end, end,
%% Convert command strings to atoms
CommandAtoms = [list_to_atom(C) || C <- Commands],
[Command | Args] = Commands,
CommandAtom = list_to_atom(Command),
BaseConfig1 = init_config1(BaseConfig), BaseConfig1 = init_config1(BaseConfig),
%% Process each command, resetting any state between each one %% Process each command, resetting any state between each one
{ok, Providers} = application:get_env(rebar, providers), {ok, Providers} = application:get_env(rebar, providers),
BaseConfig2 = rebar_config:create_logic_providers(Providers, BaseConfig1), BaseConfig2 = rebar_config:create_logic_providers(Providers, BaseConfig1),
rebar_core:process_commands(CommandAtoms, BaseConfig2),
rebar_core:process_commands(CommandAtom, Args, BaseConfig2),
ok. ok.
%% %%

+ 3
- 3
src/rebar_core.erl View File

@ -26,7 +26,7 @@
%% ------------------------------------------------------------------- %% -------------------------------------------------------------------
-module(rebar_core). -module(rebar_core).
-export([process_commands/2, help/2]).
-export([process_commands/3, help/2]).
-include("rebar.hrl"). -include("rebar.hrl").
@ -53,14 +53,14 @@ help(ParentConfig, Commands) ->
end, Providers) end, Providers)
end, Commands). end, Commands).
process_commands(Commands, ParentConfig) ->
process_commands(Command, Args, ParentConfig) ->
true = rebar_utils:expand_code_path(), true = rebar_utils:expand_code_path(),
LibDirs = rebar_config:get_local(ParentConfig, lib_dirs, ["apps", "libs", "."]), LibDirs = rebar_config:get_local(ParentConfig, lib_dirs, ["apps", "libs", "."]),
DepsDir = rebar_deps:get_deps_dir(ParentConfig), DepsDir = rebar_deps:get_deps_dir(ParentConfig),
_UpdatedCodePaths = update_code_path([DepsDir | LibDirs]), _UpdatedCodePaths = update_code_path([DepsDir | LibDirs]),
ParentConfig2 = rebar_app_discover:do(ParentConfig, LibDirs), ParentConfig2 = rebar_app_discover:do(ParentConfig, LibDirs),
TargetProviders = rebar_provider:get_target_providers(Commands, ParentConfig2),
TargetProviders = rebar_provider:get_target_providers(Command, ParentConfig2),
ParentConfig3 = ParentConfig3 =
lists:foldl(fun(TargetProvider, Conf) -> lists:foldl(fun(TargetProvider, Conf) ->
Provider = rebar_provider:get_provider(TargetProvider, rebar_config:providers(Conf)), Provider = rebar_provider:get_provider(TargetProvider, rebar_config:providers(Conf)),

+ 0
- 1
src/rebar_deps.erl View File

@ -50,7 +50,6 @@
init(State) -> init(State) ->
State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER, State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER,
provider_impl = ?MODULE, provider_impl = ?MODULE,
provides = deps,
bare = false, bare = false,
deps = ?DEPS, deps = ?DEPS,
example = "rebar deps", example = "rebar deps",

+ 2
- 3
src/rebar_erlydtl_compiler.erl View File

@ -104,8 +104,8 @@
-include("rebar.hrl"). -include("rebar.hrl").
-define(PROVIDER, erlydtl).
-define(DEPS, [app_builder]).
-define(PROVIDER, compile).
-define(DEPS, []).
%% =================================================================== %% ===================================================================
%% Public API %% Public API
@ -115,7 +115,6 @@
init(State) -> init(State) ->
State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER, State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER,
provider_impl = ?MODULE, provider_impl = ?MODULE,
provides = compile,
bare = false, bare = false,
deps = ?DEPS, deps = ?DEPS,
example = "compile", example = "compile",

+ 0
- 1
src/rebar_escripter.erl View File

@ -51,7 +51,6 @@
init(State) -> init(State) ->
State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER, State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER,
provider_impl = ?MODULE, provider_impl = ?MODULE,
provides = escriptize,
bare = false, bare = false,
deps = ?DEPS, deps = ?DEPS,
example = "escriptize", example = "escriptize",

+ 5
- 3
src/rebar_provider.erl View File

@ -81,10 +81,12 @@ impl(Provider) ->
format(#provider{provider_impl=Mod}) -> format(#provider{provider_impl=Mod}) ->
erlang:atom_to_list(Mod). erlang:atom_to_list(Mod).
get_target_providers(Targets, State) ->
get_target_providers(Target, State) ->
Providers = rebar_config:providers(State), Providers = rebar_config:providers(State),
TargetProviders = lists:filter(fun(#provider{provides=T}) ->
lists:member(T, Targets)
TargetProviders = lists:filter(fun(#provider{name=T}) when T =:= Target->
true;
(#provider{name=T}) ->
false
end, Providers), end, Providers),
process_deps(TargetProviders, Providers). process_deps(TargetProviders, Providers).

+ 2
- 3
src/rebar_prv_app_builder.erl View File

@ -7,7 +7,7 @@
-include("rebar.hrl"). -include("rebar.hrl").
-define(PROVIDER, app_builder).
-define(PROVIDER, compile).
-define(DEPS, [deps]). -define(DEPS, [deps]).
%% =================================================================== %% ===================================================================
@ -18,10 +18,9 @@
init(State) -> init(State) ->
State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER, State1 = rebar_config:add_provider(State, #provider{name = ?PROVIDER,
provider_impl = ?MODULE, provider_impl = ?MODULE,
provides = build,
bare = false, bare = false,
deps = ?DEPS, deps = ?DEPS,
example = "rebar build",
example = "rebar compile",
short_desc = "", short_desc = "",
desc = "", desc = "",
opts = []}), opts = []}),

+ 1
- 1
src/rebar_shell.erl View File

@ -36,7 +36,7 @@
-include("rebar.hrl"). -include("rebar.hrl").
-define(PROVIDER, shell). -define(PROVIDER, shell).
-define(DEPS, [app_builder]).
-define(DEPS, [compile]).
%% =================================================================== %% ===================================================================
%% Public API %% Public API

Loading…
Cancel
Save