diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2016-01-10 12:36:09 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2016-01-10 12:36:09 -0500 |
| commit | dd98f117880d0e33f3da51765014a59d53d62cbe (patch) | |
| tree | cbc08e45a9373b52b1818096ad851f19b2356e24 /src/rebar_relx.erl | |
| parent | 27cc7df9be5cfa3d67819c7c5bc8cf11623472db (diff) | |
| parent | fe7b4aa3ed62fdf411a9f61f55536419e2c5bdbe (diff) | |
Merge pull request #1009 from tsloughter/master
merge overlay entries into a single {overlay, list()} for relx
Diffstat (limited to 'src/rebar_relx.erl')
| -rw-r--r-- | src/rebar_relx.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/rebar_relx.erl b/src/rebar_relx.erl index cb8fac5..5d29258 100644 --- a/src/rebar_relx.erl +++ b/src/rebar_relx.erl @@ -30,8 +30,9 @@ do(Module, Command, Provider, State) -> relx:main([{lib_dirs, LibDirs} ,{caller, api} | output_dir(OutputDir, Options)], AllOptions); Config -> + Config1 = merge_overlays(Config), relx:main([{lib_dirs, LibDirs} - ,{config, Config} + ,{config, Config1} ,{caller, api} | output_dir(OutputDir, Options)], AllOptions) end, rebar_hooks:run_all_hooks(Cwd, post, Provider, Providers, State), @@ -49,3 +50,12 @@ format_error(Reason) -> output_dir(OutputDir, Options) -> [{output_dir, OutputDir} || not(lists:member("-o", Options)) andalso not(lists:member("--output-dir", Options))]. + +merge_overlays(Config) -> + {Overlays, Others} = + lists:partition(fun(C) when element(1, C) =:= overlay -> true; + (_) -> false + end, Config), + %% Have profile overlay entries come before others to match how profiles work elsewhere + NewOverlay = lists:reverse(lists:flatmap(fun({overlay, Overlay}) -> Overlay end, Overlays)), + [{overlay, NewOverlay} | Others]. |