Merge pull request #332 from tsloughter/rebar3

update erlydtl and switch to rebar3

.gitignore

@@ -1,3 +1,4 @@
+_build
 deps/*
 ebin/*
 *.beam

.travis.yml

@@ -1,17 +1,9 @@
 language: erlang
 otp_release:
-  - 17.1
   - 17.0
   - R16B03-1
-  - R16B03
-  - R16B02
-  - R16B01
-  - R16B
   - R15B03
-  - R15B02
-  - R15B01
-  - R15B
-script: "make get-rebar && make rebuild"
+script: "./rebar3 ct"
 branches:
   only:
     - master

README.md

@@ -27,19 +27,15 @@ Building
 
 To build relx and generate a standalone escript executable:
 
-    $ make
+    $ ./rebar3 escriptize
 
-This creates the executable `relx`.
-
-Note, if using your own `rebar`, it must at least be > version
-2.2.0-20-g6e24cd6. Unfortunately, the 2.2.0 release of rebar is not
-sufficient.
+This creates the executable `_build/default/relx`.
 
 Building on Windows
 -------------------
 
-To build relx on Windows you'll need to have rebar installed and the path to
-the rebar binary added to the `PATH` environment variable. To start the build
+To build relx on Windows you'll need to have rebar3 installed and the path to
+the rebar3 binary added to the `PATH` environment variable. To start the build
 use the `bootstrap` batch file:
 
     c:\> bootstrap

bootstrap.cmd

@@ -1,8 +1,8 @@
 :: A script to build relx on Windows
-:: Requires rebar
+:: Requires rebar3
 
 :: Get dependencies, compile and escriptize relx
-@cmd /c @rebar -r get-deps compile escriptize
+@cmd /c @rebar3 escriptize
 
 :: Create a shortcut file for running the relx command
 @set relx_cmd=relx.cmd

rebar.config

@@ -1,26 +1,21 @@
 %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*-
 %% Dependencies ================================================================
-{deps, [{rebar_vsn_plugin, ".*",
-         {git, "https://github.com/erlware/rebar_vsn_plugin.git",
-          {branch, "master"}}},
-        {neotoma, ".*",
-         {git, "https://github.com/seancribbs/neotoma.git", {branch, "master"}}},
-        {erlware_commons, ".*",
+{deps, [{erlware_commons, ".*",
          {git, "https://github.com/erlware/erlware_commons.git",
           {branch, "master"}}},
         {providers, ".*",
          {git, "https://github.com/tsloughter/providers.git",
-          {tag, "v1.0.0"}}},
+          {tag, "v1.3.0"}}},
         {erlydtl, ".*",
          {git, "https://github.com/erlydtl/erlydtl.git",
-          {tag, "0.9.0"}}},
+          {branch, "master"}}},
         {getopt, "",
          {git, "https://github.com/jcomellas/getopt.git",
           {branch, "master"}}}]}.
 
-%% Rebar Plugins ==============================================================
-{plugin_dir, "deps/rebar_vsn_plugin/src"}.
-{plugins, [rebar_vsn_plugin]}.
+{escript_emu_args, "%%! +sbtu +A0 -noinput\n"}.
+{escript_incl_apps,
+ [getopt, erlware_commons, merl, erlydtl, providers, relx]}.
 
 %% Compiler Options ============================================================
 {erl_opts,
@@ -32,13 +27,22 @@
 %% EUnit =======================================================================
 {eunit_opts,
  [{report, {eunit_surefire, [{dir, "."}]}}]}.
-{cover_enabled, true}.
-{cover_print_enabled, true}.
 
-%% Misc =======================================================================
+%% Erlydtl =====================================================================
 {erlydtl_opts, [{doc_root, "priv/templates"},
+                force_recompile,
                 {compiler_options, [report, return, debug_info]}]}.
-{escript_incl_apps,
- [getopt, erlware_commons, erlydtl, providers]}.
-{escript_emu_args, "%%! +sbtu +A0 -noinput\n"}.
 
+{provider_hooks, [{post, [{compile, {erlydtl, compile}}]}]}.
+
+%% Profiles ====================================================================
+
+{profiles, [{dev, [{deps, [{neotoma, ".*",
+                            {git, "https://github.com/seancribbs/neotoma.git", {branch, "master"}}}
+                          ]}
+                  ]
+            }]}.
+
+{ct_opts, [{cover_spec, "cover.spec"},
+           {cover_enabled, true},
+           {cover_print_enabled, true}]}.

rebar.lock

@@ -0,0 +1,28 @@
+[{<<"rebar_vsn_plugin">>,
+  {git,"https://github.com/erlware/rebar_vsn_plugin.git",
+       {ref,"fd40c960c7912193631d948fe962e1162a8d1334"}},
+  1},
+ {<<"merl">>,
+  {git,"git://github.com/erlydtl/merl.git",
+       {ref,"750b09d44425f435ff579a4d28bf5844bb5b4ef1"}},
+  1},
+ {<<"eunit_formatters">>,
+  {git,"git://github.com/seancribbs/eunit_formatters",
+       {ref,"2c73eb6e46b0863f19507857b386a48a53aaf141"}},
+  1},
+ {<<"providers">>,
+  {git,"https://github.com/tsloughter/providers.git",
+       {ref,"f06c616dd680f787fd344c5e84d1b28b5dc6568c"}},
+  0},
+ {<<"getopt">>,
+  {git,"https://github.com/jcomellas/getopt.git",
+       {ref,"626698975e63866156159661d100785d65eab6f9"}},
+  0},
+ {<<"erlydtl">>,
+  {git,"https://github.com/erlydtl/erlydtl.git",
+       {ref,"a4ac28680d6e066aabf86b3be9f073352a1a4d40"}},
+  0},
+ {<<"erlware_commons">>,
+  {git,"https://github.com/erlware/erlware_commons.git",
+       {ref,"05b956da26788f30b3cb793fa6ace02b75f481d0"}},
+  0}].