Commits

Fred T-H committed 40803de Merge

merge from stable

  • Participants
  • Parent commits 1e4d4f1, c7090f3

Comments (0)

Files changed (4)

 *.dump
 demo-blog/compiled/*
 rel/blogerl/*
-apps/blogerl/deps/*
-apps/markdown
-apps/mochiweb
-apps/erlydtl
+deps/*
 
 ### Building & Compiling ###
 
-You need to have Erlang, agner and agnerized rebar installed (`agner install rebar`):
+You need to have Erlang installed:
 
 	./rebar get-deps
 	./rebar compile
-{sub_dirs, ["apps/blogerl"]}.
 {require_otp_vsn, "R14|R15"}.
-{lib_dirs, ["apps"]}.
-{deps_dir, "apps"}.
+{lib_dirs, ["apps","deps"]}.
+{deps_dir, "deps"}.
 {deps, [{erlydtl,  ".*", {git, "git://github.com/evanmiller/erlydtl.git", "master"}},
         {mochiweb, ".*", {git, "git://github.com/mochi/mochiweb.git", "master"}},
         {markdown, ".*", {git, "git://github.com/hypernumbers/erlmarkdown.git", "master"}}]}.
 {sys, [
-    {lib_dirs, ["../apps/"]},
+    {lib_dirs, ["../apps/", "../deps/"]},
     {rel, "blogerl", "0.9.0",
      [kernel,
       stdlib,
                    {incl_cond, include}]},
     {app, syntax_tools, [{mod_cond, derived}, {incl_cond, include}]},
     {app, kernel, [{incl_cond, include}]},
-    {app, blogerl, [{vsn, "0.9.0"},
+    {app, blogerl, [{vsn, "0.9.1"},
                     {app_file, keep},
                     {incl_cond, include},
                     {debug_info, keep}]},