[couchdb] 01/02: Include weatherreport dependency

[ja...@apache.org]

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

jaydoane pushed a commit to branch cloudant/weatherreport
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 35237509251049b7331de0faaa74ac5c91fb634f
Author: Jay Doane <ja...@apache.org>
AuthorDate: Tue Aug 6 15:49:01 2019 -0700

    Include weatherreport dependency
---
 rebar.config.script | 4 ++++
 rel/reltool.config  | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rebar.config.script b/rebar.config.script
index 1ffbf70..847b434 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -154,6 +154,10 @@ DepDescs = [
                    {tag, "3.1.1-RC2"}, [raw]},
 {fauxton,          {url, "https://github.com/apache/couchdb-fauxton"},
                    {tag, "v1.2.6"}, [raw]},
+%%
+{weatherreport,    {url, "https://github.com/cloudant/weatherreport.git"},
+                   {branch, "45918-pluggable-storage-engines"}}, % FIXME with proper tag
+>>>>>>> Include weatherreport dependency
 %% Third party deps
 {folsom,           "folsom",           {tag, "CouchDB-0.8.3"}},
 {hyper,            "hyper",            {tag, "CouchDB-2.2.0-6"}},
diff --git a/rel/reltool.config b/rel/reltool.config
index b58e400..79ead2c 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -61,7 +61,8 @@
         smoosh,
         snappy,
         %% extra
-        recon
+        recon,
+        weatherreport
     ]},
     {rel, "start_clean", "", [kernel, stdlib]},
     {boot_rel, "couchdb"},
@@ -119,9 +120,9 @@
     {app, setup, [{incl_cond, include}]},
     {app, smoosh, [{incl_cond, include}]},
     {app, snappy, [{incl_cond, include}]},
-
     %% extra
-    {app, recon, [{incl_cond, include}]}
+    {app, recon, [{incl_cond, include}]},
+    {app, weatherreport, [{incl_cond, include}]}
 ]}.
 
 {overlay_vars, "couchdb.config"}.
@@ -133,6 +134,7 @@
     {copy, "../src/couch/priv/couchjs", "bin/couchjs"},
     {copy, "../share/server/main.js", "share/server/main.js"},
     {copy, "../share/server/main-coffee.js", "share/server/main-coffee.js"},
+    {copy, "../src/weatherreport/weatherreport", "bin/weatherreport"},
     {copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"},
     {copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"},
     {template, "overlay/etc/default.ini", "etc/default.ini"},