summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoan Touzet <joant@atypical.net>2018-03-27 02:11:31 -0400
committerJoan Touzet <joant@atypical.net>2018-03-27 02:11:31 -0400
commite282d7033acc20cfc064f2e01fab2d9ef7b68d3b (patch)
tree8f025408e3a385d9c47d66bcf217f2c4aeb38c7f
parent2f725d928b06d6a875d446dea7eb3f11307ded4d (diff)
downloadcouchdb-import-setup-again.tar.gz
Update rebar.config for local src/setupimport-setup-again
-rw-r--r--.gitignore1
-rw-r--r--rebar.config.script4
2 files changed, 2 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 3f5c4b284..a1a3040c9 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 4f6f82def..7d9b7feb5 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"}]}
],