Release 0.11.1

.travis.yml

@@ -18,8 +18,6 @@ otp_release:
 #   - R15B01 failing with timeout
 #   - R15B failing with timeout
 
-# since Travis is naughty and calls rebar get-deps behind our backs,
-# we'll have to clean it up and build merl our selves.. (pre OTP 18.0)
 script: 
   - "[ ! -d deps/merl ] || make -C deps/merl && make check"
 

Makefile

@@ -18,8 +18,9 @@ update-deps:
 	@$(REBAR) update-deps
 
 .PHONY: tests
+tests: export EXTRA_CONFIG=rebar-tests.config
 tests: src/erlydtl_parser.erl
-	@$(REBAR) -C rebar-tests.config eunit
+	@$(REBAR) eunit
 
 check: tests dialyze
 

NEWS.md

@@ -4,6 +4,11 @@ This file records noteworthy changes and additions to erlydtl as
 suggested by the [GNU Coding
 Standards](http://www.gnu.org/prep/standards/html_node/NEWS-File.html#NEWS-File).
 
+## 0.11.1 (2015-10-26)
+
+Fix build issues and missed update version info in .app-file.
+
+
 ## 0.11.0 (2015-10-25)
 
 I've failed to keep track. Please check resolved issues on [github](https://github.com/erlydtl/erlydtl).

rebar-slex.config

@@ -2,7 +2,6 @@
 
 {deps,
  [{slex, ".*", {git, "git://github.com/erlydtl/slex.git", {tag, "0.2.1"}}}
-  %%,{merl, ".*", {git, "git://github.com/erlydtl/merl.git", "28e5b3829168199e8475fa91b997e0c03b90d280"}, [raw]}
  ]
 }.
 

rebar.config.script

@@ -9,11 +9,25 @@ Patch = fun (Key, Value, Config) ->
                 end
         end,
 
+Merge = fun (NewCfg) ->
+                PatchCfg =
+                    case os:getenv("EXTRA_CONFIG") of
+                        false ->
+                            NewCfg;
+                        File ->
+                            {ok, ExtraCfg} = file:consult(File),
+                            NewCfg ++ ExtraCfg
+                    end,
+                lists:foldl(
+                  fun ({K, V}, C) -> Patch(K, V, C) end,
+                  CONFIG, PatchCfg)
+        end,
+
 application:load(syntax_tools),
 case application:get_key(syntax_tools, vsn) of
     {ok, Vsn} when "1.7" > Vsn ->
         Deps = [{merl, ".*",
-                 {git, "git://github.com/erlydtl/merl.git", {branch, "erlydtl"}},
+                 {git, "git://github.com/erlydtl/merl.git", "750b09d44425f435ff579a4d28bf5844bb5b4ef1"},
                  [raw]}],
         PreHooks =
             [{"(linux|darwin|solaris)", compile, "make -C \"$REBAR_DEPS_DIR/merl\" all -W test"},
@@ -22,10 +36,10 @@ case application:get_key(syntax_tools, vsn) of
              {"(linux|darwin|solaris)", eunit, "make -C \"$REBAR_DEPS_DIR/merl\" test"},
              {"(freebsd|netbsd|openbsd)", eunit, "gmake -C \"$REBAR_DEPS_DIR/merl\" test"},
              {"win32", eunit, "make -C \"%REBAR_DEPS_DIR%/merl\" test"}],
-        lists:foldl(fun ({K, V}, C) -> Patch(K, V, C) end, CONFIG,
+
-                    [{deps, Deps},
+        Merge([{deps, Deps},
-                     {pre_hooks, PreHooks},
+               {pre_hooks, PreHooks},
-                     {erl_opts, [{d, 'MERL_DEP'}]}]);
+               {erl_opts, [{d, 'MERL_DEP'}]}]);
     _ ->
-        CONFIG
+        Merge([])
 end.

src/erlydtl.app.src

@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, erlydtl,
  [{description, "Django Template Language for Erlang"},
-  {vsn, "0.10.0"},
+  {vsn, "0.11.1"},
   {modules, []},
   {applications, [kernel, stdlib, compiler, syntax_tools, merl]},
   {registered, []}