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:04 UTC
[58/59] [abbrv] couchdb commit: updated refs/heads/1994-merge-rcouch
to 6e59a78
install applications in src/
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/483dc977
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/483dc977
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/483dc977
Branch: refs/heads/1994-merge-rcouch
Commit: 483dc97723009f5b1c67194bf6e0e1e05010829d
Parents: 6dca494
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Fri Feb 14 00:09:11 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Fri Feb 14 00:09:11 2014 +0100
----------------------------------------------------------------------
.gitignore | 40 ++++++++++++++++++------------------
Makefile | 12 +++++------
rebar.config | 4 ++--
rel/reltool.config.script | 14 ++++++-------
test/etap/test_util.erl | 4 ++--
test/javascript/test_js.escript | 2 +-
6 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/483dc977/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8153d2a..a8a57e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ THANKS
__pycache__
b
-deps
+src
rel/apache-couchdb
# rebar
@@ -31,28 +31,28 @@ rebar
support/rebar/.test
# couch_collate
-apps/couch_collate/ebin
-apps/couch_collate/priv
-apps/couch_collate/c_src/*.o
-apps/couch_collate/.libs
-apps/couch_collate/.dists
+deps/couch_collate/ebin
+deps/couch_collate/priv
+deps/couch_collate/c_src/*.o
+deps/couch_collate/.libs
+deps/couch_collate/.dists
-apps/couch/ebin
-apps/couch_replicator/ebin
-apps/couch_mrview/ebin
-apps/couch_index/ebin
-apps/couch_dbupdates/ebin
-apps/couch_plugins/ebin
-apps/couch_rel/ebin/*.beam
+deps/couch/ebin
+deps/couch_replicator/ebin
+deps/couch_mrview/ebin
+deps/couch_index/ebin
+deps/couch_dbupdates/ebin
+deps/couch_plugins/ebin
+deps/couch_rel/ebin/*.beam
# couchjs
-apps/couch/c_src/couch_js/*.o
-apps/couch/c_src/couch_js/config.h
-apps/couch/priv/couchjs
-apps/couch/c_src/spawnkillable/*.o
-apps/couch/priv/couchspawnkillable
-apps/couch/.libs
-apps/couch/.dists
+deps/couch/c_src/couch_js/*.o
+deps/couch/c_src/couch_js/config.h
+deps/couch/priv/couchjs
+deps/couch/c_src/spawnkillable/*.o
+deps/couch/priv/couchspawnkillable
+deps/couch/.libs
+deps/couch/.dists
share/server/main-coffee.js
share/server/main.js
http://git-wip-us.apache.org/repos/asf/couchdb/blob/483dc977/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 2ac7a7a..63c2fcb 100644
--- a/Makefile
+++ b/Makefile
@@ -115,18 +115,18 @@ COUCHDB_ETAP_DIR=$(BASE_DIR)/test/etap
export COUCHDB_ETAP_DIR
-ERL_FLAGS=-pa $(BASE_DIR)/deps/*/ebin -pa $(COUCHDB_ETAP_DIR)
+ERL_FLAGS=-pa $(BASE_DIR)/src/*/ebin -pa $(COUCHDB_ETAP_DIR)
export ERL_FLAGS
test: testbuild
prove $(COUCHDB_ETAP_DIR)/*.t
- prove $(BASE_DIR)/deps/couch_mrview/test/*.t
- prove $(BASE_DIR)/deps/couch_replicator/test/*.t
+ prove $(BASE_DIR)/src/couch_mrview/test/*.t
+ prove $(BASE_DIR)/src/couch_replicator/test/*.t
verbose-test: testbuild
prove -v $(COUCHDB_ETAP_DIR)/*.t
- prove -v $(BASE_DIR)/deps/couch_mrview/test/*.t
- prove -v $(BASE_DIR)/deps/couch_replicator/test/*.t
+ prove -v $(BASE_DIR)/src/couch_mrview/test/*.t
+ prove -v $(BASE_DIR)/src/couch_replicator/test/*.t
testjs: testbuild
$(ESCRIPT) $(BASE_DIR)/test/javascript/test_js.escript
@@ -142,7 +142,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)/deps/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
+ cp $(BASE_DIR)/src/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/483dc977/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 0f384c0..a6959a3 100644
--- a/rebar.config
+++ b/rebar.config
@@ -80,9 +80,9 @@
]}.
-{deps_dir, ["deps"]}.
+{deps_dir, ["src"]}.
-{libs_dir, ["deps/"]}.
+{libs_dir, ["src/"]}.
{sub_dirs, [
"support/couch_rel",
http://git-wip-us.apache.org/repos/asf/couchdb/blob/483dc977/rel/reltool.config.script
----------------------------------------------------------------------
diff --git a/rel/reltool.config.script b/rel/reltool.config.script
index 44c47cc..60e3a37 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"]},
+ {lib_dirs, ["../src"]},
{rel, "couchdb", Vsn,
[
kernel,
@@ -127,11 +127,11 @@ CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"),
{copy, "../etc/couchdb/empty", "data/KEEP"},
%% Copy base files for starting and interacting w/ node
- {copy, "../deps/node_package/priv/base/erl", "{{erts_vsn}}/bin/erl"},
- {copy, "../deps/node_package/priv/base/nodetool", "{{erts_vsn}}/bin/nodetool"},
- {template, "../deps/node_package/priv/base/runner", "bin/couchdb"},
- {template, "../deps/node_package/priv/base/env.sh", "lib/env.sh"},
- {template, "../deps/node_package/priv/base/app_epath.sh", "lib/app_epath.sh"},
+ {copy, "../src/node_package/priv/base/erl", "{{erts_vsn}}/bin/erl"},
+ {copy, "../src/node_package/priv/base/nodetool", "{{erts_vsn}}/bin/nodetool"},
+ {template, "../src/node_package/priv/base/runner", "bin/couchdb"},
+ {template, "../src/node_package/priv/base/env.sh", "lib/env.sh"},
+ {template, "../src/node_package/priv/base/app_epath.sh", "lib/app_epath.sh"},
%% config files
{template, "../etc/couchdb/app.config", "etc/app.config"},
@@ -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, "../deps/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName},
+ {copy, "../src/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName},
%% misc
{mkdir, "lib/couch-patches"},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/483dc977/test/etap/test_util.erl
----------------------------------------------------------------------
diff --git a/test/etap/test_util.erl b/test/etap/test_util.erl
index caad0b4..ce2f779 100644
--- a/test/etap/test_util.erl
+++ b/test/etap/test_util.erl
@@ -25,10 +25,10 @@ builddir() ->
filename:absname(filename:join([Current, "..", ".."])).
srcdir() ->
- filename:join([builddir(), "deps"]).
+ filename:join([builddir(), "src"]).
depsdir() ->
- filename:join([builddir(), "deps"]).
+ filename:join([builddir(), "src"]).
testdir() ->
filename:join([builddir(), "test", "out"]).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/483dc977/test/javascript/test_js.escript
----------------------------------------------------------------------
diff --git a/test/javascript/test_js.escript b/test/javascript/test_js.escript
index b3657ca..810c2f5 100755
--- a/test/javascript/test_js.escript
+++ b/test/javascript/test_js.escript
@@ -55,7 +55,7 @@ exec_loop(Port, Verbose, Acc) ->
end.
exec(Path, Verbose) ->
- COUCHJS = filename:join([test_util:builddir(), "deps", "couch", "priv",
+ COUCHJS = filename:join([test_util:builddir(), "src", "couch", "priv",
"couchjs"]),
CouchUri = filename:join([test_util:testdir(), "data", "couch.uri"]),
Cmd = string:join([COUCHJS, "-H", "-u", CouchUri,