summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2014-12-04 19:49:21 -0600
committerTristan Sloughter <t@crashfast.com>2014-12-04 19:49:46 -0600
commit3c7613add42f642636fe229f6927dfed0c2ca3e1 (patch)
treef2e9d2276fa9da8c392857a674e0a37ab2ee2ef1
parentc34e15c2f20d6fa90d254c19357a70dcda0ef23e (diff)
change name of config for where project apps lib to project_apps_dir
-rw-r--r--src/rebar.hrl2
-rw-r--r--src/rebar_dir.erl2
-rw-r--r--src/rebar_prv_app_discovery.erl2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/rebar.hrl b/src/rebar.hrl
index 260e188..fdef438 100644
--- a/src/rebar.hrl
+++ b/src/rebar.hrl
@@ -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").
diff --git a/src/rebar_dir.erl b/src/rebar_dir.erl
index a6f18ed..e692c65 100644
--- a/src/rebar_dir.erl
+++ b/src/rebar_dir.erl
@@ -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) ->
diff --git a/src/rebar_prv_app_discovery.erl b/src/rebar_prv_app_discovery.erl
index b6cdf80..5e304cb 100644
--- a/src/rebar_prv_app_discovery.erl
+++ b/src/rebar_prv_app_discovery.erl
@@ -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}