diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2014-12-05 10:21:17 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2014-12-05 10:21:17 -0600 |
| commit | 0c2f57253de80038a6c9525cc9db703bca5cbfc3 (patch) | |
| tree | 16365b5f97c246612e4a3fa95303ac1e92a4966e | |
| parent | 859121d5d9b85ca33a17120fa3f0cf8f3edf95a3 (diff) | |
| parent | 3c7613add42f642636fe229f6927dfed0c2ca3e1 (diff) | |
Merge pull request #37 from tsloughter/lib_dirs
change name of config for where project apps lib to project_apps_dir
| -rw-r--r-- | src/rebar.hrl | 2 | ||||
| -rw-r--r-- | src/rebar_dir.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_app_discovery.erl | 2 |
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} |