[couchdb] 02/02: Update rebar.config for local src/setup

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch import-setup-again
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e282d7033acc20cfc064f2e01fab2d9ef7b68d3b
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Mar 27 02:11:31 2018 -0400

    Update rebar.config for local src/setup
---
 .gitignore          | 1 -
 rebar.config.script | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f5c4b2..a1a3040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ src/meck/
 src/mochiweb/
 src/oauth/
 src/rebar/
-src/setup/
 src/snappy/
 tmp/
 
diff --git a/rebar.config.script b/rebar.config.script
index 4f6f82d..7d9b7fe 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -41,6 +41,7 @@ SubDirs = [
     "src/mango",
     "src/mem3",
     "src/rexi",
+    "src/setup",
     "rel"
 ],
 
@@ -51,7 +52,6 @@ DepDescs = [
 {ets_lru,          "ets-lru",          {tag, "1.0.0"}},
 {khash,            "khash",            {tag, "1.0.1"}},
 {snappy,           "snappy",           {tag, "CouchDB-1.0.0"}},
-{setup,            "setup",            {tag, "1.0.1"}},
 {ioq,              "ioq",              {tag, "1.0.1"}},
 
 %% Non-Erlang deps
@@ -100,7 +100,7 @@ AddConfig = [
         {plt_location, COUCHDB_ROOT},
         {plt_extra_apps, [
             asn1, bcrypt, compiler, crypto, inets, kernel, os_mon, runtime_tools,
-            sasl, ssl, stdlib, syntax_tools, xmerl]},
+            sasl, setup, ssl, stdlib, syntax_tools, xmerl]},
         {warnings, [unmatched_returns, error_handling, race_conditions]}]},
     {post_hooks, [{compile, "escript support/build_js.escript"}]}
 ],

-- 
To stop receiving notification emails like this one, please contact
wohali@apache.org.