ソースを参照

Merge pull request #71 from tsloughter/master

add erlydtl namespace
pull/72/head
Tristan Sloughter 10年前
コミット
e81e6d2e31
2個のファイルの変更7行の追加9行の削除
  1. +4
    -4
      rebar.config
  2. +3
    -5
      src/rebar_prv_erlydtl_compiler.erl

+ 4
- 4
rebar.config ファイルの表示

@ -22,14 +22,14 @@
{git, "https://github.com/erlware/erlware_commons.git",
{branch, "master"}}},
{providers, "",
{git, "https://github.com/ferd/providers.git",
{branch, "namespaces"}}},
{git, "https://github.com/tsloughter/providers.git",
{branch, "master"}}},
{erlydtl, ".*",
{git, "https://github.com/erlydtl/erlydtl.git",
{tag, "0.9.4"}}},
{relx, "",
{git, "https://github.com/tsloughter/relx.git",
{branch, "format_error1"}}},
{git, "https://github.com/erlware/relx.git",
{branch, "master"}}},
{getopt, "", {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}},
{meck, "", {git, "https://github.com/eproxus/meck.git", {tag, "0.8.2"}}}]}.

+ 3
- 5
src/rebar_prv_erlydtl_compiler.erl ファイルの表示

@ -105,7 +105,7 @@
-include("rebar.hrl").
-define(PROVIDER, erlydtl).
-define(PROVIDER, compile).
-define(DEPS, []).
%% ===================================================================
@ -116,9 +116,10 @@
init(State) ->
State1 = rebar_state:add_provider(State, providers:create([{name, ?PROVIDER},
{module, ?MODULE},
{namespace, erlydtl},
{bare, false},
{deps, ?DEPS},
{example, "rebar erlydtl compile"},
{example, "rebar3 erlydtl compile"},
{short_desc, "Compile erlydtl templates."},
{desc, ""},
{opts, []}])),
@ -126,8 +127,6 @@ init(State) ->
do(Config) ->
MultiDtlOpts = erlydtl_opts(Config),
OrigPath = code:get_path(),
%true = code:add_path(rebar_utils:ebin_dir()),
Result = lists:foldl(fun(DtlOpts, _) ->
file:make_dir(option(out_dir, DtlOpts)),
@ -143,7 +142,6 @@ do(Config) ->
{recursive, option(recursive, DtlOpts)}])
end, ok, MultiDtlOpts),
true = code:set_path(OrigPath),
{Result, Config}.
-spec format_error(any()) -> iolist().

読み込み中…
キャンセル
保存