You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/15 10:50:01 UTC
[55/59] [abbrv] couchdb commit: updated refs/heads/1994-merge-rcouch
to 6e59a78
small update
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/77ed4d1c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/77ed4d1c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/77ed4d1c
Branch: refs/heads/1994-merge-rcouch
Commit: 77ed4d1ca35c222817787a38a6c6f3c3918350a1
Parents: c085543
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Thu Feb 13 18:08:08 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Thu Feb 13 19:14:34 2014 +0100
----------------------------------------------------------------------
Makefile | 10 +++---
rebar.config | 73 +++++++++++++++++++++++++++++++-----------
rel/reltool.config.script | 4 +--
test/etap/test_util.erl | 2 +-
4 files changed, 62 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77ed4d1c/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 117ff9c..a88b9ec 100644
--- a/Makefile
+++ b/Makefile
@@ -119,13 +119,13 @@ export ERL_LIBS
test: testbuild
prove $(COUCHDB_ETAP_DIR)/*.t
- prove $(BASE_DIR)/apps/couch_mrview/test/*.t
- prove $(BASE_DIR)/apps/couch_replicator/test/*.t
+ prove $(BASE_DIR)/deps/couch_mrview/test/*.t
+ prove $(BASE_DIR)/deps/couch_replicator/test/*.t
verbose-test: testbuild
prove -v $(COUCHDB_ETAP_DIR)/*.t
- prove -v $(BASE_DIR)/apps/couch_mrview/test/*.t
- prove -v $(BASE_DIR)/apps/couch_replicator/test/*.t
+ prove -v $(BASE_DIR)/deps/couch_mrview/test/*.t
+ prove -v $(BASE_DIR)/deps/couch_replicator/test/*.t
testjs: testbuild
$(ESCRIPT) $(BASE_DIR)/test/javascript/test_js.escript
@@ -141,7 +141,7 @@ testbuild: testclean
mkdir -p $(BASE_DIR)/test/out/bin
mkdir -p $(BASE_DIR)/test/out/share
mkdir -p $(BASE_DIR)/test/out/log
- cp $(BASE_DIR)/apps/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
+ cp $(BASE_DIR)/deps/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
cp -r $(BASE_DIR)/share/server $(BASE_DIR)/test/out/share
cp -r $(BASE_DIR)/share/www $(BASE_DIR)/test/out/share
cp $(BASE_DIR)/etc/couchdb/local.ini $(BASE_DIR)/test/out/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77ed4d1c/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 81f7e48..4c956ab 100644
--- a/rebar.config
+++ b/rebar.config
@@ -14,42 +14,77 @@
{tag, "1.3.8"}}},
%% erlang oauth module
- {oauth, ".*", {git, "git://github.com/refuge/erlang-oauth.git", {branch,
- "master"}}},
+ {oauth, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-oauth.git",
+ {branch, "import"}}},
%% ibrowse module , http client
- {ibrowse, ".*", {git, "git://github.com/refuge/ibrowse.git",
- {branch, "master"}}},
+ {ibrowse, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse.git",
+ {branch, "import"}}},
%% mochiweb module, http framework
- {mochiweb, ".*", {git,"git://github.com/refuge/mochiweb.git",
- {branch, "master"}}},
+ {mochiweb, ".*",
+ {git,"http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb.git",
+ {branch, "import-upstream"}}},
%% snappy module, used for compression
- {snappy, ".*", {git, "git://github.com/refuge/snappy-erlang.git",
- {branch, "refuge"}}},
+ {snappy, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-snappy.git",
+ {branch, "import"}}},
%% json module, encode/decode module
- {jiffy, ".*", {git, "git://github.com/refuge/jiffy.git", "master"}},
+ {jiffy, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-jiffy.git",
+ {branch, "import"}}},
%% lager logging module
- {lager, ".*", {git, "git://github.com/refuge/lager.git", "master"}}
+ {lager, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-lager.git",
+ {branch, "master"}}},
+
+
+ %% apps
+ {couch_collate, ".*",
+ {git,"http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch_httpd, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch_index, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-index.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch_mrview, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch_replicator, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch_plugins, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins.git",
+ {branch, "1994-merge-rcouch"}}},
+
+ {couch_dbupdates, ".*",
+ {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-dbupdates.git",
+ {branch, "1994-merge-rcouch"}}}
+
]}.
{deps_dir, ["deps"]}.
-{libs_dir, ["apps", "deps/"]}.
+{libs_dir, ["deps/"]}.
{sub_dirs, [
- "apps/couch_collate",
- "apps/couch",
- "apps/couch_httpd",
- "apps/couch_index",
- "apps/couch_mrview",
- "apps/couch_replicator",
- "apps/couch_plugins",
- "apps/couch_dbupdates",
"support/couch_rel",
"rel"
]}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77ed4d1c/rel/reltool.config.script
----------------------------------------------------------------------
diff --git a/rel/reltool.config.script b/rel/reltool.config.script
index c413557..44c47cc 100644
--- a/rel/reltool.config.script
+++ b/rel/reltool.config.script
@@ -43,7 +43,7 @@ CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"),
[
{sys, [
- {lib_dirs, ["../deps", "../apps"]},
+ {lib_dirs, ["../deps"]},
{rel, "couchdb", Vsn,
[
kernel,
@@ -145,7 +145,7 @@ CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"),
{copy, "../share/server/main.js", "share/server"},
{copy, "../share/server/main-coffee.js", "share/server"},
{copy, "../share/www", "share"},
- {copy, "../apps/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName},
+ {copy, "../deps/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName},
%% misc
{mkdir, "lib/couch-patches"},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/77ed4d1c/test/etap/test_util.erl
----------------------------------------------------------------------
diff --git a/test/etap/test_util.erl b/test/etap/test_util.erl
index 9208335..caad0b4 100644
--- a/test/etap/test_util.erl
+++ b/test/etap/test_util.erl
@@ -25,7 +25,7 @@ builddir() ->
filename:absname(filename:join([Current, "..", ".."])).
srcdir() ->
- filename:join([builddir(), "apps"]).
+ filename:join([builddir(), "deps"]).
depsdir() ->
filename:join([builddir(), "deps"]).