You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/05 15:35:03 UTC
[3/6] couchdb commit: updated
refs/heads/1843-feature-bigcouch-multi-repo to 3069c01
Move to multiple repositories
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/52689b75
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/52689b75
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/52689b75
Branch: refs/heads/1843-feature-bigcouch-multi-repo
Commit: 52689b75d7a13dd1df4dee48098856cc54857e93
Parents: 26dbcc1
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Feb 3 16:16:43 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Feb 5 08:34:52 2014 -0600
----------------------------------------------------------------------
.gitignore | 1 +
configure | 2 ++
rebar.config | 42 ------------------------------------------
rebar.config.script | 47 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 50 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/52689b75/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a43a06b..7b37cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ install.mk
rel/*.config
rel/dev*
rel/tmpdata
+src/
*.o
*.so
http://git-wip-us.apache.org/repos/asf/couchdb/blob/52689b75/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 4e59ca6..c95a988 100755
--- a/configure
+++ b/configure
@@ -80,3 +80,5 @@ cat > rel/dev$i.config << EOF
{backend_port, `expr 10000 \* $i + 5986`}.
EOF
done
+
+rebar get-deps && rebar update-deps && cat rel/couchdb.config
http://git-wip-us.apache.org/repos/asf/couchdb/blob/52689b75/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
deleted file mode 100644
index 1372f26..0000000
--- a/rebar.config
+++ /dev/null
@@ -1,42 +0,0 @@
-% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License. You may obtain a copy of
-% the License at
-%
-% http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing, software
-% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-% License for the specific language governing permissions and limitations under
-% the License.
-
-{require_otp_vsn, "R14B01|R14B03|R14B04|R15B02|R15B03|R16"}.
-
-{sub_dirs, [
- "src/ibrowse",
- "src/config",
- "src/couch",
- "src/couch_index",
- "src/couch_mrview",
- "src/mem3",
-
- "src/chttpd",
- "src/couch_replicator",
- "src/ddoc_cache",
- "src/ejson",
- "src/ets_lru",
- "src/fabric",
- "src/mochiweb",
- "src/oauth",
- "src/rexi",
- "src/snappy",
- "src/twig",
-
- "rel"
-]}.
-
-{lib_dirs, ["src/"]}.
-
-{erl_opts, [debug_info]}.
-
-{post_hooks, [{compile, "escript support/build_js.escript"}]}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/52689b75/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
new file mode 100644
index 0000000..0efa6fa
--- /dev/null
+++ b/rebar.config.script
@@ -0,0 +1,47 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+{require_otp_vsn, "R14B01|R14B03|R14B04|R15B02|R15B03|R16"}.
+
+DepDescs = [
+ {chttpd, "couchdb-chttpd", {branch, import}},
+ {config, "couchdb-config", {branch, import}},
+ {couch, "couchdb-couch", {branch, import}},
+ {couch_index, "couchdb-couch-index", {branch, import}},
+ {couch_mrview, "couchdb-couch-mrview", {branch, import}},
+ {couch_replicator, "couchdb-couch-replicator", {branch, import}},
+ {ddoc_cache, "couchdb-ddoc-cache", {branch, import}},
+ {ets_lru, "couchdb-ets-lru", {branch, import}},
+ {fabric, "couchdb-fabric", {branch, import}},
+ {ibrowse, "couchdb-ibrowse", {branch, import}},
+ {jiffy, "couchdb-jiffy", {branch, import}},
+ {mem3, "couchdb-mem3", {branch, import}},
+ {mochiweb, "couchdb-mochiweb", {branch, import}},
+ {oauth, "couchdb-oauth", {branch, import}},
+ {rexi, "couchdb-rexi", {branch, import}},
+ {snappy, "couchdb-snappy", {branch, import}},
+ {twig, "couchdb-twig", {branch, import}}
+],
+
+MakeDep = fun({AppName, RepoName, Version}) ->
+ Url = "https://git-wip-us.apache.org/repos/asf/" ++ RepoName ++ ".git",
+ {AppName, ".*", {git, Url, Version}}
+end,
+
+[
+ {deps_dir, "src"},
+ {deps, lists:map(MakeDep, DepDescs)},
+ {sub_dirs, ["rel"]},
+ {lib_dirs, ["src/"]},
+ {erl_opts, [debug_info]},
+ {post_hooks, [{compile, "escript support/build_js.escript"}]}
+].