Browse Source

Update app file to exclude merl app when shipped with syntax_tools. (fixes #210)

Andreas Stenius 9 years ago
parent
commit
f8602ca664
3 changed files with 14 additions and 8 deletions
  1. BIN
      rebar
  2. 0 8
      src/erlydtl.app.src
  3. 14 0
      src/erlydtl.app.src.script

BIN
rebar


+ 0 - 8
src/erlydtl.app.src

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

+ 14 - 0
src/erlydtl.app.src.script

@@ -0,0 +1,14 @@
+%% -*- mode: erlang -*-
+application:load(syntax_tools),
+ExtraApps = case application:get_key(syntax_tools, vsn) of
+                {ok, Vsn} when "1.7" > Vsn -> [merl];
+                _ -> []
+            end,
+
+{application, erlydtl,
+ [{description, "Django Template Language for Erlang"},
+  {vsn, git},
+  {modules, []},
+  {applications, [kernel, stdlib, compiler, syntax_tools|ExtraApps]},
+  {registered, []}
+ ]}.