diff options
| author | Andreas Stenius <git@astekk.se> | 2014-02-02 21:17:14 +0100 |
|---|---|---|
| committer | Andreas Stenius <git@astekk.se> | 2014-02-14 13:35:51 +0100 |
| commit | 33110267bae3ff3b0511267016a1915c01e8d287 (patch) | |
| tree | baeab6d0e2aab79a62c23f03f3afaf4bc8aea2b3 | |
| parent | ec448c089429050bfecbfb9bd211510cdaf3a496 (diff) | |
| download | rebar-33110267bae3ff3b0511267016a1915c01e8d287.tar.gz | |
Adapt erlydtl compiler plugin to latest version of erlydtl
| -rw-r--r-- | src/rebar_erlydtl_compiler.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl index fea8ea6..ae64bcb 100644 --- a/src/rebar_erlydtl_compiler.erl +++ b/src/rebar_erlydtl_compiler.erl @@ -178,7 +178,7 @@ compile_dtl(Config, Source, Target, DtlOpts) -> ?ERROR("~n===============================================~n" " You need to install erlydtl to compile DTL templates~n" " Download the latest tarball release from github~n" - " http://code.google.com/p/erlydtl/~n" + " https://github.com/erlydtl/erlydtl/releases~n" " and install it into your erlang library dir~n" "===============================================~n~n", []), ?FAIL; @@ -194,6 +194,11 @@ compile_dtl(Config, Source, Target, DtlOpts) -> do_compile(Config, Source, Target, DtlOpts) -> %% TODO: Check last mod on target and referenced DTLs here.. + %% erlydtl >= 0.8.1 does not use the extra indirection using the + %% compiler_options. Kept for backward compatibility with older + %% versions of erlydtl. + CompilerOptions = option(compiler_options, DtlOpts), + %% ensure that doc_root and out_dir are defined, %% using defaults if necessary Opts = lists:ukeymerge(1, @@ -202,7 +207,8 @@ do_compile(Config, Source, Target, DtlOpts) -> [{out_dir, option(out_dir, DtlOpts)}, {doc_root, option(doc_root, DtlOpts)}, {custom_tags_dir, option(custom_tags_dir, DtlOpts)}, - {compiler_options, option(compiler_options, DtlOpts)}])), + {compiler_options, CompilerOptions} + |CompilerOptions])), ?INFO("Compiling \"~s\" -> \"~s\" with options:~n ~s~n", [Source, Target, io_lib:format("~p", [Opts])]), case erlydtl:compile(Source, @@ -220,7 +226,9 @@ do_compile(Config, Source, Target, DtlOpts) -> rebar_base_compiler:error_tuple(Config, Source, [Error], [], Opts); {error, Msg} -> Es = [{Source, [{erlydtl_parser, Msg}]}], - rebar_base_compiler:error_tuple(Config, Source, Es, [], Opts) + rebar_base_compiler:error_tuple(Config, Source, Es, [], Opts); + {error, Es, Ws} -> + rebar_base_compiler:error_tuple(Config, Source, Es, Ws, Opts) end. module_name(Target) -> |