Sfoglia il codice sorgente

Merge pull request #37 from tsloughter/lib_dirs

change name of config for where project apps lib to project_apps_dir
pull/42/head
Tristan Sloughter 10 anni fa
parent
commit
0c2f57253d
3 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. +1
    -1
      src/rebar.hrl
  2. +1
    -1
      src/rebar_dir.erl
  3. +1
    -1
      src/rebar_prv_app_discovery.erl

+ 1
- 1
src/rebar.hrl Vedi File

@ -15,7 +15,7 @@
-define(DEFAULT_BASE_DIR, "_build").
-define(DEFAULT_PROFILE_DIR, "default").
-define(DEFAULT_LIB_DIRS, ["_checkouts", "apps", "lib", "."]).
-define(DEFAULT_PROJECT_APP_DIRS, ["_checkouts", "apps", "lib", "."]).
-define(DEFAULT_DEPS_DIR, "lib").
-define(DEFAULT_PLUGINS_DIR, "plugins").
-define(DEFAULT_TEST_DEPS_DIR, "test/lib").

+ 1
- 1
src/rebar_dir.erl Vedi File

@ -44,7 +44,7 @@ plugins_dir(State) ->
-spec lib_dirs(rebar_state:t()) -> file:filename_all().
lib_dirs(State) ->
rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS).
rebar_state:get(State, project_app_dirs, ?DEFAULT_PROJECT_APP_DIRS).
-spec default_profile_dir(rebar_state:t()) -> file:filename_all().
default_profile_dir(State) ->

+ 1
- 1
src/rebar_prv_app_discovery.erl Vedi File

@ -32,7 +32,7 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) ->
LibDirs = rebar_state:get(State, lib_dirs, ?DEFAULT_LIB_DIRS),
LibDirs = rebar_dir:lib_dirs(State),
try
State1 = rebar_app_discover:do(State, LibDirs),
{ok, State1}

Caricamento…
Annulla
Salva