diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2019-07-04 17:35:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 17:35:21 -0400 |
| commit | 892f5704bc6bfd822366b7bb9810ff8654a145f8 (patch) | |
| tree | 2c6fbf5109f485571e967904d605a3f0227c438e /src/rebar_prv_edoc.erl | |
| parent | 77579d5da44af7a27802ca0875edfacf1774c686 (diff) | |
| parent | 44ab2dfd1ab5627496b04cafd56e8a494a926cc2 (diff) | |
Merge pull request #2116 from ferd/fix-umbrella-edoc-opts
Ensure EDoc opts in umbrella apps are respected
Diffstat (limited to 'src/rebar_prv_edoc.erl')
| -rw-r--r-- | src/rebar_prv_edoc.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rebar_prv_edoc.erl b/src/rebar_prv_edoc.erl index c78296a..5e563ab 100644 --- a/src/rebar_prv_edoc.erl +++ b/src/rebar_prv_edoc.erl @@ -45,7 +45,10 @@ do(State) -> AppName = rebar_utils:to_list(rebar_app_info:name(AppInfo)), ?INFO("Running edoc for ~ts", [AppName]), AppDir = rebar_app_info:dir(AppInfo), - AppRes = (catch edoc:application(list_to_atom(AppName), AppDir, EdocOptsAcc)), + AppOpts = rebar_app_info:opts(AppInfo), + %% order of the merge is important to allow app opts overrides + AppEdocOpts = rebar_opts:get(AppOpts, edoc_opts, []) ++ EdocOptsAcc, + AppRes = (catch edoc:application(list_to_atom(AppName), AppDir, AppEdocOpts)), rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, AppInfo, State), case {AppRes, ShouldAccPaths} of {ok, true} -> |