wiparchive/rebar3rebar3

3 files changed, 43 insertions, 41 deletions

diff --git a/Makefile b/Makefile
index 018c84514..23c703156 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 
 include version.mk
 
-REBAR?=$(shell echo `pwd`/bin/rebar)
+REBAR?=$(shell echo `pwd`/bin/rebar3)
 IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
 COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi)
 COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)
diff --git a/configure b/configure
index 5a39e0a5b..274c906a0 100755
--- a/configure
+++ b/configure
@@ -82,9 +82,9 @@ parse_opts() {
 
             --rebar)
                 if [ -x "$2" ]; then
-                    version=`$2 --version 2> /dev/null | grep -o "2\.[6-9]\.[0-9]"`
+                    version=`$2 --version 2> /dev/null | grep -o "3\.[6-9]\.[0-9]"`
                     if [ $? -ne 0 ]; then
-                        printf 'Rebar >=2.6.0 and <3.0.0 required' >&2
+                        printf 'Rebar >3.0.0 required' >&2
                         exit 1
                     fi
                     eval REBAR=$2
@@ -187,23 +187,25 @@ EOF
 
 
 install_local_rebar() {
-    if [ ! -x "${rootdir}/bin/rebar" ]; then
+    if [ ! -x "${rootdir}/bin/rebar3" ]; then
         if [ ! -d "${rootdir}/src/rebar" ]; then
-            git clone --depth 1 --branch 2.6.0 https://git-wip-us.apache.org/repos/asf/couchdb-rebar.git ${rootdir}/src/rebar
+            git clone --depth 1 --branch 3.3.1 https://github.com/erlang/rebar3.git ${rootdir}/src/rebar
         fi
-        make -C ${rootdir}/src/rebar
-        mv ${rootdir}/src/rebar/rebar ${rootdir}/bin/rebar
-        make -C ${rootdir}/src/rebar clean
+        cd ${rootdir}/src/rebar && ./bootstrap
+        ${rootdir}/src/rebar/rebar3 clean
+        mv ${rootdir}/src/rebar/rebar3 ${rootdir}/bin/rebar3
+
     fi
 }
 
 
 if [ -z "${REBAR}" ]; then
     install_local_rebar
-    REBAR=${rootdir}/bin/rebar
+    REBAR=${rootdir}/bin/rebar3
 fi
 
 
+### mehhh
 # only update dependencies, when we are not in a release tarball
 if [ -d .git  -a $SKIP_DEPS -ne 1 ]; then
     echo "==> updating dependencies"
diff --git a/rebar.config.script b/rebar.config.script
index 1639d015f..1c8ebb991 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,39 +23,39 @@ os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
 
 DepDescs = [
 %% must be compiled first as it has a custom behavior
-{couch_epi,        "couch-epi",        "f6ad55d804ac741b59fe37dd092787113847661c"},
-{config,           "config",           "a83b75ef4d3dc80071ae8ae412fb0c724726d12c"},
+{couch_epi,        "couch-epi",        {ref, "f6ad55d804ac741b59fe37dd092787113847661c"}},
+{config,           "config",           {ref, "a83b75ef4d3dc80071ae8ae412fb0c724726d12c"}},
 %% keep these sorted
-{b64url,           "b64url",           "6895652d80f95cdf04efb14625abed868998f174"},
-{couch_log,        "couch-log",        "ad803f66dbd1900b67543259142875a6d03503ce"},
-{chttpd,           "chttpd",           "2c1f3a3167b4b667ec8cbc5a5079911a17630753"},
-{couch,            "couch",            "a468b0db6f1a9795b32e26c34b340df4d51f31b0"},
-{couch_index,      "couch-index",      "53555fd909d5dd3d4a610c3fd6795950a8f7d022"},
-{couch_mrview,     "couch-mrview",     "a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"},
-{couch_replicator, "couch-replicator", "b9232c8d410d529d65030896e075c4b4327631b0"},
-{couch_plugins,    "couch-plugins",    "3e73b723cb126cfc471b560d17c24a8b5c540085"},
-{couch_event,      "couch-event",      "7e382132219d708239306aa3591740694943d367"},
-{couch_stats,      "couch-stats",      "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
-{couch_peruser,    "peruser",          "4eea9571171a5b41d832da32204a1122a01f4b0e"},
-{couch_tests,       "erlang-tests",    "37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs,             "documentation",    "a135f2fe89f7b228b793aa2a8a62f0f34b576d8f", [raw]},
-{ddoc_cache,       "ddoc-cache",       "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
-{ets_lru,          "ets-lru",          "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
-{fabric,           "fabric",           "f84750e3d31accf7bcadb0ba05249c23ce920521"},
+{b64url,           "b64url",           {ref, "6895652d80f95cdf04efb14625abed868998f174"}},
+{couch_log,        "couch-log",        {ref, "ad803f66dbd1900b67543259142875a6d03503ce"}},
+{chttpd,           "chttpd",           {ref, "2c1f3a3167b4b667ec8cbc5a5079911a17630753"}},
+{couch,            "couch",            {ref, "a468b0db6f1a9795b32e26c34b340df4d51f31b0"}},
+{couch_index,      "couch-index",      {ref, "53555fd909d5dd3d4a610c3fd6795950a8f7d022"}},
+{couch_mrview,     "couch-mrview",     {ref, "a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"}},
+{couch_replicator, "couch-replicator", {ref, "b9232c8d410d529d65030896e075c4b4327631b0"}},
+{couch_plugins,    "couch-plugins",    {ref, "3e73b723cb126cfc471b560d17c24a8b5c540085"}},
+{couch_event,      "couch-event",      {ref, "7e382132219d708239306aa3591740694943d367"}},
+{couch_stats,      "couch-stats",      {ref, "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"}},
+{couch_peruser,    "peruser",          {ref, "4eea9571171a5b41d832da32204a1122a01f4b0e"}},
+{couch_tests,      "erlang-tests",     {ref, "37b3bfeb4b1a48a592456e67991362e155ed81e0"}},
+{docs,             "documentation",    {ref, "a135f2fe89f7b228b793aa2a8a62f0f34b576d8f"}, [raw]},
+{ddoc_cache,       "ddoc-cache",       {ref, "c762e90a33ce3cda19ef142dd1120f1087ecd876"}},
+{ets_lru,          "ets-lru",          {ref, "c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"}},
+{fabric,           "fabric",           {ref, "f84750e3d31accf7bcadb0ba05249c23ce920521"}},
 {fauxton,          "fauxton",          {tag, "v1.1.9"}, [raw]},
-{folsom,           "folsom",           "a5c95dec18227c977029fbd3b638966d98f17003"},
-{global_changes,   "global-changes",   "f6e4c5629a7d996d284e4489f1897c057823f846"},
-{ibrowse,          "ibrowse",          "4af2d408607874d124414ac45df1edbe3961d1cd"},
-{ioq,              "ioq",              "ba99ec70d31cf82fe4868ab4bb92b0978f4fe67f"},
-{jiffy,            "jiffy",            "d3c00e19d8fa20c21758402231247602190988d3"},
-{khash,            "khash",            "7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango,            "mango",            "610ccb60d09bb2a730fa1af318c6ce558538d2ba"},
-{mem3,             "mem3",             "252467cb4a27637090b5f9006483f5b7ab551699"},
-{mochiweb,         "mochiweb",         "bd6ae7cbb371666a1f68115056f7b30d13765782"},
-{oauth,            "oauth",            "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
-{rexi,             "rexi",             "a327b7dbeb2b0050f7ca9072047bf8ef2d282833"},
-{snappy,           "snappy",           "a728b960611d0795025de7e9668d06b9926c479d"},
-{setup,            "setup",            "b9e1f3b5d5a78a706abb358e17130fb7344567d2"},
+{folsom,           "folsom",           {ref, "a5c95dec18227c977029fbd3b638966d98f17003"}},
+{global_changes,   "global-changes",   {ref, "f6e4c5629a7d996d284e4489f1897c057823f846"}},
+{ibrowse,          "ibrowse",          {ref, "4af2d408607874d124414ac45df1edbe3961d1cd"}},
+{ioq,              "ioq",              {ref, "ba99ec70d31cf82fe4868ab4bb92b0978f4fe67f"}},
+{jiffy,            "jiffy",            {ref, "d3c00e19d8fa20c21758402231247602190988d3"}},
+{khash,            "khash",            {ref, "7c6a9cd9776b5c6f063ccafedfa984b00877b019"}},
+{mango,            "mango",            {ref, "610ccb60d09bb2a730fa1af318c6ce558538d2ba"}},
+{mem3,             "mem3",             {ref, "252467cb4a27637090b5f9006483f5b7ab551699"}},
+{mochiweb,         "mochiweb",         {ref, "bd6ae7cbb371666a1f68115056f7b30d13765782"}},
+{oauth,            "oauth",            {ref, "099057a98e41f3aff91e77e3cf496d6c6fd901df"}},
+{rexi,             "rexi",             {ref, "a327b7dbeb2b0050f7ca9072047bf8ef2d282833"}},
+{snappy,           "snappy",           {ref, "a728b960611d0795025de7e9668d06b9926c479d"}},
+{setup,            "setup",            {ref, "b9e1f3b5d5a78a706abb358e17130fb7344567d2"}},
 {meck,             "meck",             {tag, "0.8.2"}}
 ],
 
@@ -81,8 +81,8 @@ AddConfig = [
     {sub_dirs, ["rel"]},
     {lib_dirs, ["src/"]},
     {erl_opts, [debug_info]},
+    {plugins, [pc]},
     {eunit_opts, [verbose]},
-    {plugins, [eunit_plugin]},
     {dialyzer, [
         {plt_location, local},
         {plt_location, COUCHDB_ROOT},