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 2013/12/19 14:07:06 UTC
git commit: updated refs/heads/1843-feature-bigcouch to 135b04b
Updated Branches:
refs/heads/1843-feature-bigcouch ba152cb21 -> 135b04b75
squash! Build with rebar
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/135b04b7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/135b04b7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/135b04b7
Branch: refs/heads/1843-feature-bigcouch
Commit: 135b04b756c7dc8b66e81b31e4d8833f129eede9
Parents: ba152cb
Author: Robert Newson <rn...@apache.org>
Authored: Thu Dec 19 12:44:31 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Dec 19 13:06:51 2013 +0000
----------------------------------------------------------------------
rebar.config | 6 ++--
rel/files/README | 4 +++
rel/files/sys.config | 1 +
rel/files/vm.args | 0
rel/reltool.config | 7 +---
src/couch/priv/stat_descriptions.cfg | 50 ++++++++++++++++++++++++++++
src/couch/priv/stat_descriptions.cfg.in | 50 ----------------------------
src/couch/rebar.config | 11 ++++++
src/couch/src/couch.app.src | 2 +-
9 files changed, 72 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 903e5cd..1ae51fd 100644
--- a/rebar.config
+++ b/rebar.config
@@ -13,9 +13,9 @@
{sub_dirs, [
"src/ibrowse",
"src/config",
+ "src/couch",
"src/couch_index",
"src/couch_mrview",
- "src/couch",
"src/mem3",
"src/chttpd",
@@ -28,7 +28,9 @@
"src/oauth",
"src/rexi",
"src/snappy",
- "src/twig"
+ "src/twig",
+
+ "rel"
]}.
{lib_dirs, ["src/"]}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/rel/files/README
----------------------------------------------------------------------
diff --git a/rel/files/README b/rel/files/README
new file mode 100644
index 0000000..5ee9386
--- /dev/null
+++ b/rel/files/README
@@ -0,0 +1,4 @@
+Ignore these files for now.
+
+This is to pacify newer rebar that insists on having a sys.config and
+a vm.args in releases/$VSN/.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/rel/files/sys.config
----------------------------------------------------------------------
diff --git a/rel/files/sys.config b/rel/files/sys.config
new file mode 100644
index 0000000..57afcca
--- /dev/null
+++ b/rel/files/sys.config
@@ -0,0 +1 @@
+[].
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/rel/files/vm.args
----------------------------------------------------------------------
diff --git a/rel/files/vm.args b/rel/files/vm.args
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index ffc03f4..049531c 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -16,7 +16,6 @@
chttpd,
config,
couch,
- couch_event,
couch_replicator,
crypto,
ddoc_cache,
@@ -49,7 +48,6 @@
{app, chttpd, [{incl_cond, include}]},
{app, config, [{incl_cond, include}]},
{app, couch, [{incl_cond, include}]},
- {app, couch_event, [{incl_cond, include}]},
{app, couch_replicator, [{incl_cond, include}]},
{app, ddoc_cache, [{incl_cond, include}]},
{app, ets_lru, [{incl_cond, include}]},
@@ -57,7 +55,7 @@
{app, mem3, [{incl_cond, include}]},
{app, rexi, [{incl_cond, include}]},
{app, snappy, [{incl_cond, include}]},
- {app, twig, [{incl_cond, include}]},
+ {app, twig, [{incl_cond, include}]}
]}.
{overlay_vars, "couchdb.config"}.
@@ -65,9 +63,6 @@
{mkdir, "var/log"},
{copy, "overlay/bin"},
{copy, "overlay/etc"},
- {copy, "overlay/share"},
- {copy, "../couchjs/build/couchjs", "bin/couchjs"},
- {copy, "../couchjs/build/main.js", "share/couchjs/main.js"},
{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"},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/src/couch/priv/stat_descriptions.cfg
----------------------------------------------------------------------
diff --git a/src/couch/priv/stat_descriptions.cfg b/src/couch/priv/stat_descriptions.cfg
new file mode 100644
index 0000000..b80d768
--- /dev/null
+++ b/src/couch/priv/stat_descriptions.cfg
@@ -0,0 +1,50 @@
+%% 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.
+
+% Style guide for descriptions: Start with a lowercase letter & do not add
+% a trailing full-stop / period
+% Please keep this in alphabetical order
+
+{couchdb, database_writes, "number of times a database was changed"}.
+{couchdb, database_reads, "number of times a document was read from a database"}.
+{couchdb, open_databases, "number of open databases"}.
+{couchdb, open_os_files, "number of file descriptors CouchDB has open"}.
+{couchdb, request_time, "length of a request inside CouchDB without MochiWeb"}.
+{couchdb, auth_cache_hits, "number of authentication cache hits"}.
+{couchdb, auth_cache_misses, "number of authentication cache misses"}.
+
+{httpd, bulk_requests, "number of bulk requests"}.
+{httpd, requests, "number of HTTP requests"}.
+{httpd, temporary_view_reads, "number of temporary view reads"}.
+{httpd, view_reads, "number of view reads"}.
+{httpd, clients_requesting_changes, "number of clients for continuous _changes"}.
+
+{httpd_request_methods, 'COPY', "number of HTTP COPY requests"}.
+{httpd_request_methods, 'DELETE', "number of HTTP DELETE requests"}.
+{httpd_request_methods, 'GET', "number of HTTP GET requests"}.
+{httpd_request_methods, 'HEAD', "number of HTTP HEAD requests"}.
+{httpd_request_methods, 'POST', "number of HTTP POST requests"}.
+{httpd_request_methods, 'PUT', "number of HTTP PUT requests"}.
+
+{httpd_status_codes, '200', "number of HTTP 200 OK responses"}.
+{httpd_status_codes, '201', "number of HTTP 201 Created responses"}.
+{httpd_status_codes, '202', "number of HTTP 202 Accepted responses"}.
+{httpd_status_codes, '301', "number of HTTP 301 Moved Permanently responses"}.
+{httpd_status_codes, '304', "number of HTTP 304 Not Modified responses"}.
+{httpd_status_codes, '400', "number of HTTP 400 Bad Request responses"}.
+{httpd_status_codes, '401', "number of HTTP 401 Unauthorized responses"}.
+{httpd_status_codes, '403', "number of HTTP 403 Forbidden responses"}.
+{httpd_status_codes, '404', "number of HTTP 404 Not Found responses"}.
+{httpd_status_codes, '405', "number of HTTP 405 Method Not Allowed responses"}.
+{httpd_status_codes, '409', "number of HTTP 409 Conflict responses"}.
+{httpd_status_codes, '412', "number of HTTP 412 Precondition Failed responses"}.
+{httpd_status_codes, '500', "number of HTTP 500 Internal Server Error responses"}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/src/couch/priv/stat_descriptions.cfg.in
----------------------------------------------------------------------
diff --git a/src/couch/priv/stat_descriptions.cfg.in b/src/couch/priv/stat_descriptions.cfg.in
deleted file mode 100644
index b80d768..0000000
--- a/src/couch/priv/stat_descriptions.cfg.in
+++ /dev/null
@@ -1,50 +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.
-
-% Style guide for descriptions: Start with a lowercase letter & do not add
-% a trailing full-stop / period
-% Please keep this in alphabetical order
-
-{couchdb, database_writes, "number of times a database was changed"}.
-{couchdb, database_reads, "number of times a document was read from a database"}.
-{couchdb, open_databases, "number of open databases"}.
-{couchdb, open_os_files, "number of file descriptors CouchDB has open"}.
-{couchdb, request_time, "length of a request inside CouchDB without MochiWeb"}.
-{couchdb, auth_cache_hits, "number of authentication cache hits"}.
-{couchdb, auth_cache_misses, "number of authentication cache misses"}.
-
-{httpd, bulk_requests, "number of bulk requests"}.
-{httpd, requests, "number of HTTP requests"}.
-{httpd, temporary_view_reads, "number of temporary view reads"}.
-{httpd, view_reads, "number of view reads"}.
-{httpd, clients_requesting_changes, "number of clients for continuous _changes"}.
-
-{httpd_request_methods, 'COPY', "number of HTTP COPY requests"}.
-{httpd_request_methods, 'DELETE', "number of HTTP DELETE requests"}.
-{httpd_request_methods, 'GET', "number of HTTP GET requests"}.
-{httpd_request_methods, 'HEAD', "number of HTTP HEAD requests"}.
-{httpd_request_methods, 'POST', "number of HTTP POST requests"}.
-{httpd_request_methods, 'PUT', "number of HTTP PUT requests"}.
-
-{httpd_status_codes, '200', "number of HTTP 200 OK responses"}.
-{httpd_status_codes, '201', "number of HTTP 201 Created responses"}.
-{httpd_status_codes, '202', "number of HTTP 202 Accepted responses"}.
-{httpd_status_codes, '301', "number of HTTP 301 Moved Permanently responses"}.
-{httpd_status_codes, '304', "number of HTTP 304 Not Modified responses"}.
-{httpd_status_codes, '400', "number of HTTP 400 Bad Request responses"}.
-{httpd_status_codes, '401', "number of HTTP 401 Unauthorized responses"}.
-{httpd_status_codes, '403', "number of HTTP 403 Forbidden responses"}.
-{httpd_status_codes, '404', "number of HTTP 404 Not Found responses"}.
-{httpd_status_codes, '405', "number of HTTP 405 Method Not Allowed responses"}.
-{httpd_status_codes, '409', "number of HTTP 409 Conflict responses"}.
-{httpd_status_codes, '412', "number of HTTP 412 Precondition Failed responses"}.
-{httpd_status_codes, '500', "number of HTTP 500 Internal Server Error responses"}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/src/couch/rebar.config
----------------------------------------------------------------------
diff --git a/src/couch/rebar.config b/src/couch/rebar.config
new file mode 100644
index 0000000..def6879
--- /dev/null
+++ b/src/couch/rebar.config
@@ -0,0 +1,11 @@
+{port_specs, [{"priv/couch_icu_driver.so", ["priv/icu_driver/couch_icu_driver.c"]}]}.
+
+{port_env, [
+ {"DRV_CFLAGS", "$DRV_CFLAGS -DPIC -O2 -fno-common"},
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"},
+ {"linux", "DRV_LDFLAGS", "$DRV_LDFLAGS -lcrypt"},
+ {"freebsd", "DRV_CFLAGS", "$DRV_CFLAGS -I/usr/local/include"},
+ {"freebsd", "DRV_LDFLAGS", "$DRV_LDFLAGS -L/usr/local/lib"},
+ {"solaris", "DRV_CFLAGS", "$DRV_CFLAGS -I/opt/local/include"},
+ {"solaris", "DRV_LDFLAGS", "$DRV_LDFLAGS -L/opt/local/lib"}
+]}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/135b04b7/src/couch/src/couch.app.src
----------------------------------------------------------------------
diff --git a/src/couch/src/couch.app.src b/src/couch/src/couch.app.src
index 0cc3b54..bb1e527 100644
--- a/src/couch/src/couch.app.src
+++ b/src/couch/src/couch.app.src
@@ -18,5 +18,5 @@
]},
{mod, {couch_app, []}},
{applications, [kernel, stdlib, crypto, sasl, inets, oauth, ibrowse,
- mochiweb, ssl, twig, couch_event]}
+ mochiweb, ssl, twig]}
]}.