Browse Source

Use proplists:unfold to make sure we feed a proplist to keymerge.

pull/3/head
David N. Welton 11 years ago
committed by Andreas Stenius
parent
commit
f7d62dee68
1 changed files with 9 additions and 8 deletions
  1. +9
    -8
      src/rebar_erlydtl_compiler.erl

+ 9
- 8
src/rebar_erlydtl_compiler.erl View File

@ -199,16 +199,17 @@ do_compile(Config, Source, Target, DtlOpts) ->
%% versions of erlydtl.
CompilerOptions = option(compiler_options, DtlOpts),
Sorted = proplists:unfold(
lists:sort(
[{out_dir, option(out_dir, DtlOpts)},
{doc_root, option(doc_root, DtlOpts)},
{custom_tags_dir, option(custom_tags_dir, DtlOpts)},
{compiler_options, CompilerOptions}
|CompilerOptions])),
%% ensure that doc_root and out_dir are defined,
%% using defaults if necessary
Opts = lists:ukeymerge(1,
DtlOpts,
lists:sort(
[{out_dir, option(out_dir, DtlOpts)},
{doc_root, option(doc_root, DtlOpts)},
{custom_tags_dir, option(custom_tags_dir, DtlOpts)},
{compiler_options, CompilerOptions}
|CompilerOptions])),
Opts = lists:ukeymerge(1, DtlOpts, Sorted),
?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n",
[Source, Target, io_lib:format("~p", [Opts])]),
case erlydtl:compile(Source,

Loading…
Cancel
Save