You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/10/01 17:23:23 UTC
[1/3] couchdb commit: updated refs/heads/master to fe4f3d1
Repository: couchdb
Updated Branches:
refs/heads/master 368c821fd -> fe4f3d1b3
Make sure we compile couch_epi first
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b6094bb3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b6094bb3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b6094bb3
Branch: refs/heads/master
Commit: b6094bb393cc8eb42ef2382faa09e1c56066fd9c
Parents: 368c821
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue Sep 29 13:25:32 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed Sep 30 11:56:02 2015 -0700
----------------------------------------------------------------------
rebar.config.script | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b6094bb3/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 55b5842..41dcf13 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -15,8 +15,10 @@
ConfigureEnv = filename:join(filename:dirname(SCRIPT), "config.erl"),
os:putenv("COUCHDB_CONFIG", ConfigureEnv).
-
DepDescs = [
+%% must be compiled first as it has a custom behavior
+{couch_epi, "couch-epi", "33e8bae844e0994f024ee067196161d61872fcfb"},
+%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
{cassim, "cassim", "1ae21f7c415acf3d1aba8b4924ca3093014b86b1"},
{couch_log, "couch-log", "7e615ac1b27c61e63b2b8015800ed51ece0f7ad3"},
@@ -24,7 +26,6 @@ DepDescs = [
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
{chttpd, "chttpd", "64a5728152ea0a17dd71f133241ef47575fdf98a"},
{couch, "couch", "2594c7f123ebeecd3887d8dd01170e91d6ed26cb"},
-{couch_epi, "couch-epi", "aa72f6ffcc9c7095ed59b4d56f5f8139a5205a1f"},
{couch_index, "couch-index", "6565cb961a8da21b21d213e4981133e119bb5ff1"},
{couch_mrview, "couch-mrview", "d7f0093b1c83a721dd8e9a9b3c625d0575e26c9f"},
{couch_replicator, "couch-replicator", "73139f0ebaee1b7bb49f926aebb0c3106c21ce74"},
[3/3] couchdb commit: updated refs/heads/master to fe4f3d1
Posted by rn...@apache.org.
update deps
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fe4f3d1b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fe4f3d1b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fe4f3d1b
Branch: refs/heads/master
Commit: fe4f3d1b3b0106d6bc024f9d2a78f8af3d859e64
Parents: 1196e07
Author: Robert Newson <rn...@apache.org>
Authored: Thu Oct 1 16:12:56 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Oct 1 16:21:34 2015 +0100
----------------------------------------------------------------------
rebar.config.script | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/fe4f3d1b/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 04fe1e5..ec339ec 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,41 +23,41 @@ 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", "33e8bae844e0994f024ee067196161d61872fcfb"},
+{couch_epi, "couch-epi", "be34447c5ba0e474d851858b5346b33f864788e6"},
%% keep these sorted
{b64url, "b64url", "319fc604235ab1fde37047b38a432450161db750"},
{cassim, "cassim", "1ae21f7c415acf3d1aba8b4924ca3093014b86b1"},
-{couch_log, "couch-log", "7e615ac1b27c61e63b2b8015800ed51ece0f7ad3"},
+{couch_log, "couch-log", "fb4157370403c4c97f19d958a51c889950a66a94"},
{couch_log_lager, "couch-log-lager", "64cd100cb566ce93af9ef168fa86f9f70424b77b"},
{config, "config", "b2ecd0d47a776256956ce045123423494ff85e8e"},
-{chttpd, "chttpd", "64a5728152ea0a17dd71f133241ef47575fdf98a"},
-{couch, "couch", "2594c7f123ebeecd3887d8dd01170e91d6ed26cb"},
-{couch_index, "couch-index", "6565cb961a8da21b21d213e4981133e119bb5ff1"},
+{chttpd, "chttpd", "ddd63eefa9db5b533595b7ba14443a6b7581361c"},
+{couch, "couch", "4ca9e4184e3a56a34e22550a3b62cbb6ab9e46c5"},
+{couch_index, "couch-index", "14f579dcd142ee90300244c854b301bbd5c863ee"},
{couch_mrview, "couch-mrview", "d7f0093b1c83a721dd8e9a9b3c625d0575e26c9f"},
{couch_replicator, "couch-replicator", "73139f0ebaee1b7bb49f926aebb0c3106c21ce74"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
{couch_peruser, "peruser", "ff7d190970a46722137fbc7a1a75466e8a544ae1"},
-{docs, "documentation", "57a65effe92685f54aa21e2512b5f6590ed08dc0", [raw]},
+{docs, "documentation", "8f9f149925e3d42bebd7ffa944982c0c9af4c675", [raw]},
{ddoc_cache, "ddoc-cache", "c762e90a33ce3cda19ef142dd1120f1087ecd876"},
{ets_lru, "ets-lru", "09128046ae9fbabfe1d70cb406aca878f6ea1dd5"},
{fabric, "fabric", "17f0377807804b7b55db6c6b378d9e266ea52236"},
-{fauxton, "fauxton", "f0d4518617ac58fa394f7b3db92dd605d7253c98", [raw]},
+{fauxton, "fauxton", "ebd9ced89d27de297526acf74ebad88f1c6a6711", [raw]},
{folsom, "folsom", "fbb7bc83806520ffef84107c85f53c1f7113c20d"},
-{global_changes, "global-changes", "16d0200bcf1dc1700b07168f7a8174b486b9735d"},
+{global_changes, "global-changes", "07097ce3e10e970e4f00d487baf75c782943c8f8"},
{goldrush, "goldrush", {tag, "0.1.6"}},
{ibrowse, "ibrowse", "4af2d408607874d124414ac45df1edbe3961d1cd"},
{ioq, "ioq", "c7c75ebeaf41599e3a3e211097d864f0e7785829"},
{jiffy, "jiffy", "ea19c417f9fd52fa3f7ef2d378735e5532c59b29"},
{khash, "khash", "fc1a80fe38cb7f1c19ba0b4d275f14fbf3b5251e"},
-{mango, "mango", "9eb60e78ca2d8abb42d40324470dd54d37a84746"},
-{mem3, "mem3", "07c865611c5ff20dcbc17da126662471d0d6be57"},
+{mango, "mango", "46b58a3c53bc07db8b841fd55dc9fb32c1b6bb89"},
+{mem3, "mem3", "62ac9b2655cc50a9260f37d25829ab7f3c86f251"},
{mochiweb, "mochiweb", "bd6ae7cbb371666a1f68115056f7b30d13765782"},
{oauth, "oauth", "099057a98e41f3aff91e77e3cf496d6c6fd901df"},
{rexi, "rexi", "a327b7dbeb2b0050f7ca9072047bf8ef2d282833"},
{snappy, "snappy", "0ab2796f82789895a2a86d403e63f3823d3c5a1d"},
-{setup, "setup", "647ffbc4a1216239045af1e210863b9086f71cf4"},
+{setup, "setup", "d0a9b722485639fc43ccbfc4267f3a2dd9aa9d5a"},
{meck, "meck", {tag, "0.8.2"}}
],
[2/3] couchdb commit: updated refs/heads/master to fe4f3d1
Posted by rn...@apache.org.
Use rel/apps/couch_epi.config for configuring EPI
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1196e076
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1196e076
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1196e076
Branch: refs/heads/master
Commit: 1196e0761767dc3323ed8268018f4b0836a7ada2
Parents: b6094bb
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Wed Sep 30 09:03:32 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed Sep 30 11:56:06 2015 -0700
----------------------------------------------------------------------
rebar.config.script | 8 +++++++-
rel/apps/couch_epi.config | 9 +++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1196e076/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 41dcf13..04fe1e5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -12,9 +12,15 @@
% Set the path to the configuration environment generated
% by `./configure`.
-ConfigureEnv = filename:join(filename:dirname(SCRIPT), "config.erl"),
+
+COUCHDB_ROOT = filename:dirname(SCRIPT).
+os:putenv("COUCHDB_ROOT", COUCHDB_ROOT).
+
+ConfigureEnv = filename:join(COUCHDB_ROOT, "config.erl").
os:putenv("COUCHDB_CONFIG", ConfigureEnv).
+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", "33e8bae844e0994f024ee067196161d61872fcfb"},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1196e076/rel/apps/couch_epi.config
----------------------------------------------------------------------
diff --git a/rel/apps/couch_epi.config b/rel/apps/couch_epi.config
new file mode 100644
index 0000000..79867d2
--- /dev/null
+++ b/rel/apps/couch_epi.config
@@ -0,0 +1,9 @@
+{plugins, [
+ couch_db_epi,
+ chttpd_epi,
+ couch_index_epi,
+ global_changes_epi,
+ mango_epi,
+ mem3_epi,
+ setup_epi
+]}.