Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBFA110068 for ; Tue, 7 Jan 2014 15:16:44 +0000 (UTC) Received: (qmail 52719 invoked by uid 500); 7 Jan 2014 15:16:41 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 52551 invoked by uid 500); 7 Jan 2014 15:16:38 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 52535 invoked by uid 99); 7 Jan 2014 15:16:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jan 2014 15:16:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CCE1D39702; Tue, 7 Jan 2014 15:16:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Tue, 07 Jan 2014 15:16:36 -0000 Message-Id: <8c03103de40d478aae7b2064bf117ea1@git.apache.org> In-Reply-To: <3b1dae5392494c0abfb8b30dfcb224fa@git.apache.org> References: <3b1dae5392494c0abfb8b30dfcb224fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/1994-merge-rcouch to 5622151 working release Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5622151c Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5622151c Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5622151c Branch: refs/heads/1994-merge-rcouch Commit: 5622151ce2ecb422ce5c64390af083f430db25e6 Parents: 7bf5cda Author: Benoit Chesneau Authored: Tue Jan 7 16:14:56 2014 +0100 Committer: Benoit Chesneau Committed: Tue Jan 7 16:14:56 2014 +0100 ---------------------------------------------------------------------- .gitignore | 1 + apps/couch/priv/stat_descriptions.cfg | 50 +++++ apps/couch/priv/stat_descriptions.cfg.in | 50 ----- apps/couch/rebar.config.script | 22 +- apps/couch/src/couch.app.src | 4 +- apps/couch_collate/src/couch_collate.app.src | 2 +- .../couch_dbupdates/src/couch_dbupdates.app.src | 2 +- apps/couch_index/src/couch_index.app.src | 2 +- apps/couch_mrview/src/couch_mrview.app.src | 2 +- apps/couch_plugins/src/couch_plugins.app.src | 2 +- .../src/couch_replicator.app.src | 2 +- pkg.vars.config.in | 4 +- rebar.config | 19 +- rel/files/empty | 0 rel/reltool.config.script | 219 ++++++++++--------- 15 files changed, 196 insertions(+), 185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index eacde2b..3d4c404 100644 --- a/.gitignore +++ b/.gitignore @@ -136,6 +136,7 @@ src/fauxton/app/initialize.js deps pkg.vars.config +rel/apache-couchdb # rebar support/rebar/rebar http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch/priv/stat_descriptions.cfg ---------------------------------------------------------------------- diff --git a/apps/couch/priv/stat_descriptions.cfg b/apps/couch/priv/stat_descriptions.cfg new file mode 100644 index 0000000..b80d768 --- /dev/null +++ b/apps/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/5622151c/apps/couch/priv/stat_descriptions.cfg.in ---------------------------------------------------------------------- diff --git a/apps/couch/priv/stat_descriptions.cfg.in b/apps/couch/priv/stat_descriptions.cfg.in deleted file mode 100644 index b80d768..0000000 --- a/apps/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/5622151c/apps/couch/rebar.config.script ---------------------------------------------------------------------- diff --git a/apps/couch/rebar.config.script b/apps/couch/rebar.config.script index e8b987c..fb93f97 100644 --- a/apps/couch/rebar.config.script +++ b/apps/couch/rebar.config.script @@ -38,21 +38,27 @@ Version = case os:getenv("RELEASE") of BaseVersion ++ SecondaryVersion end, -Cfg1 = [{package_string, proplists:get_value(vendor_name, Cfg, "") - ++ " " ++ Version }, - {package_version, Version}] ++ Cfg, +%% couchjs name +CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"), + +%% build config.h +ConfigH = [{package_name, proplists:get_value(vendor_name, Cfg, "")}, + {package_string, proplists:get_value(vendor_name, Cfg, "") + ++ " " ++ Version }, + {package_bugreport, proplists:get_value(package_bugreport, Cfg, "")}, + {package_version, Version}, + {couchjs_name, CouchJSName}], %% write config.h -CfgStr = lists:foldl(fun({K, V}, Acc) -> +ConfigHStr = lists:foldl(fun({K, V}, Acc) -> K1 = string:to_upper(atom_to_list(K)), case K1 of "VERSION_" ++ _ -> Acc; _ -> ["#define ", K1, " ", $", V, $", $\n | Acc] end - end, [], Cfg1), -ok = file:write_file("c_src/couch_js/config.h", iolist_to_binary(CfgStr)), - + end, [], ConfigH), +ok = file:write_file("c_src/couch_js/config.h", iolist_to_binary(ConfigHStr)), GetFlag = fun(Name, Default) -> case os:getenv(Name) of @@ -84,7 +90,7 @@ PortEnv = [{port_env, [ {"LDFLAGS", "$LDFLAGS " ++ LDFLAGS1}]}, {port_specs, [ - {filename:join(["priv", "couchjs"]), + {filename:join(["priv", CouchJSName]), ["c_src/couch_js/*.c"]}]} ], http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch/src/couch.app.src ---------------------------------------------------------------------- diff --git a/apps/couch/src/couch.app.src b/apps/couch/src/couch.app.src index 2d14148..53cee43 100644 --- a/apps/couch/src/couch.app.src +++ b/apps/couch/src/couch.app.src @@ -1,6 +1,6 @@ {application, couch, [ - {description, "@package_name@"}, - {vsn, "@version@"}, + {description, "Apache CouchDB"}, + {vsn, "1.6.1"}, {registered, [ couch_config, couch_db_update, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch_collate/src/couch_collate.app.src ---------------------------------------------------------------------- diff --git a/apps/couch_collate/src/couch_collate.app.src b/apps/couch_collate/src/couch_collate.app.src index 4541b67..c41495c 100644 --- a/apps/couch_collate/src/couch_collate.app.src +++ b/apps/couch_collate/src/couch_collate.app.src @@ -4,7 +4,7 @@ {application, couch_collate, [ {description, "couchdb collation module"}, - {vsn, "0.1.0"}, + {vsn, "1.0.0"}, {registered, []}, {applications, [kernel, stdlib]}, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch_dbupdates/src/couch_dbupdates.app.src ---------------------------------------------------------------------- diff --git a/apps/couch_dbupdates/src/couch_dbupdates.app.src b/apps/couch_dbupdates/src/couch_dbupdates.app.src index c420283..54a543e 100644 --- a/apps/couch_dbupdates/src/couch_dbupdates.app.src +++ b/apps/couch_dbupdates/src/couch_dbupdates.app.src @@ -1,7 +1,7 @@ {application, couch_dbupdates, [ {description, ""}, - {vsn, "@version@"}, + {vsn, "1.0.0"}, {registered, []}, {applications, [ kernel, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch_index/src/couch_index.app.src ---------------------------------------------------------------------- diff --git a/apps/couch_index/src/couch_index.app.src b/apps/couch_index/src/couch_index.app.src index 687a2e2..6a59e99 100644 --- a/apps/couch_index/src/couch_index.app.src +++ b/apps/couch_index/src/couch_index.app.src @@ -12,7 +12,7 @@ {application, couch_index, [ {description, "CouchDB Secondary Index Manager"}, - {vsn, "@version@"}, + {vsn, "1.3.0"}, {modules, []}, {registered, [couch_index_server]}, {applications, [kernel, stdlib, couch]}, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch_mrview/src/couch_mrview.app.src ---------------------------------------------------------------------- diff --git a/apps/couch_mrview/src/couch_mrview.app.src b/apps/couch_mrview/src/couch_mrview.app.src index 52898a6..cce2c97 100644 --- a/apps/couch_mrview/src/couch_mrview.app.src +++ b/apps/couch_mrview/src/couch_mrview.app.src @@ -12,7 +12,7 @@ {application, couch_mrview, [ {description, "CouchDB Map/Reduce Views"}, - {vsn, "%version%"}, + {vsn, "1.3.0"}, {modules, [ couch_mrview, couch_mrview_compactor, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch_plugins/src/couch_plugins.app.src ---------------------------------------------------------------------- diff --git a/apps/couch_plugins/src/couch_plugins.app.src b/apps/couch_plugins/src/couch_plugins.app.src index d961289..9e69b84 100644 --- a/apps/couch_plugins/src/couch_plugins.app.src +++ b/apps/couch_plugins/src/couch_plugins.app.src @@ -12,7 +12,7 @@ {application, couch_plugins, [ {description, "A CouchDB Plugin Installer"}, - {vsn, "1"}, + {vsn, "0.1.0"}, {registered, []}, {applications, [ kernel, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/apps/couch_replicator/src/couch_replicator.app.src ---------------------------------------------------------------------- diff --git a/apps/couch_replicator/src/couch_replicator.app.src b/apps/couch_replicator/src/couch_replicator.app.src index 1e62edf..3e71b3b 100644 --- a/apps/couch_replicator/src/couch_replicator.app.src +++ b/apps/couch_replicator/src/couch_replicator.app.src @@ -12,7 +12,7 @@ {application, couch_replicator, [ {description, "CouchDB replicator"}, - {vsn, "%version%"}, + {vsn, "1.6.1"}, {modules, []}, {registered, [ couch_replicator_manager_sup, http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/pkg.vars.config.in ---------------------------------------------------------------------- diff --git a/pkg.vars.config.in b/pkg.vars.config.in index 9042b15..c562ee4 100644 --- a/pkg.vars.config.in +++ b/pkg.vars.config.in @@ -14,12 +14,12 @@ % the License. {package_name, "apache-couchdb"}. -{package_install_name, "couchdb"}. +{package_install_name, "apache-couchdb"}. {package_install_user, "couchdb"}. {package_install_group, "couchdb"}. {package_install_user_desc, "Apache CouchDB user"}. {package_bugreport, "https://issues.apache.org/jira/browse/COUCHDB"}. -{package_commands, {list, [[{name, "couch"}], [{name, "couchjs"}]]}}. +{package_commands, {list, [[{name, "couchdb"}], [{name, "couchjs"}]]}}. {package_shortdesc, "Apache CouchDB"}. {package_desc, "Apache CouchDB - document oriented database"}. {package_patch_dir, "couch-patches"}. http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/rebar.config ---------------------------------------------------------------------- diff --git a/rebar.config b/rebar.config index e630795..1770f5f 100644 --- a/rebar.config +++ b/rebar.config @@ -4,10 +4,15 @@ {cover_enabled, true}. {eunit_opts, [{report,{eunit_surefire,[{dir,"."}]}}]}. {edoc_opts, [{preprocess, true}]}. +{erl_opts, [debug_info, fail_on_warning]}. -{require_otp_vsn, "R15|R16"}. +{require_otp_vsn, "R14B04|R15|R16"}. {deps, [ + %% packaging + {node_package, ".*", {git, "git://github.com/basho/node_package", + {tag, "1.3.8"}}}, + %% erlang oauth module {oauth, ".*", {git, "git://github.com/refuge/erlang-oauth.git", {branch, "master"}}}, @@ -25,14 +30,11 @@ {branch, "refuge"}}}, %% json module, encode/decode module - {jiffy, ".*", {git, "git://github.com/refuge/jiffy.git", "master"}}, - - %% packaging - {node_package, ".*", {git, "git://github.com/basho/node_package", - {tag, "1.3.8"}}} - + {jiffy, ".*", {git, "git://github.com/refuge/jiffy.git", "master"}} ]}. +{lib_dirs, ["apps", "deps"]}. + {sub_dirs, [ "apps/couch_collate", "apps/couch", @@ -41,5 +43,6 @@ "apps/couch_replicator", "apps/couch_plugins", "apps/couch_dbupdates", - "apps/couch_rel" + "apps/couch_rel", + "rel" ]}. http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/rel/files/empty ---------------------------------------------------------------------- diff --git a/rel/files/empty b/rel/files/empty new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/couchdb/blob/5622151c/rel/reltool.config.script ---------------------------------------------------------------------- diff --git a/rel/reltool.config.script b/rel/reltool.config.script index fb1bcf9..646c74c 100644 --- a/rel/reltool.config.script +++ b/rel/reltool.config.script @@ -38,112 +38,113 @@ Vsn = case os:getenv("RELEASE") of BaseVersion ++ SecondaryVersion end, - -{sys, [ - {lib_dirs, ["../deps", "../apps"]}, - {rel, "couchdb", Vsn, - [ - kernel, - stdlib, - sasl, - public_key, - ssl, - os_mon, - crypto, - inets, - xmerl, - runtime_tools, - mochiweb, - ibrowse, - oauth, - jiffy, - snappy, - couch_stats, - couch, - couch_collates, - couch_index, - couch_mrview, - couch_replicator, - couch_dbupdates, - couch_plugins - ]}, - {rel, "start_clean", "", [kernel, stdlib]}, - {boot_rel, "couch"}, - {profile, embedded}, - {relocatable, true}, - {app_file, strip}, - {debug_info, strip}, - {incl_cond, exclude}, - - {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)"]}, - {excl_archive_filters, [".*"]}, - - %% stdlib - {app, asn1, [{incl_cond, include}]}, - {app, sasl, [{incl_cond, include}]}, - {app, crypto, [{incl_cond, include}]}, - {app, public_key, [{incl_cond, include}]}, - {app, ssl, [{incl_cond, include}]}, - {app, xmerl, [{incl_cond, include}]}, - - {app, kernel, [{incl_cond, include}]}, - {app, stdlib, [{incl_cond, include}]}, - {app, inets, [{incl_cond, include}]}, - {app, os_mon, [{incl_cond, include}]}, - {app, compiler, [{incl_cond, include}]}, - {app, syntax_tools, [{incl_cond, include}]}, - {app, runtime_tools, [{incl_cond, include}]}, - - %% dependencies - {app, mochiweb, [{incl_cond, include}]}, - {app, oauth, [{incl_cond, include}]}, - {app, jiffy, [{incl_cond, include}]}, - {app, snappy, [{incl_cond, include}]}, - {app, ibrowse, [{incl_cond, include}]}, - - %% couchdb - {app, couch, [{incl_cond, include}]}, - {app, couch_collate, [{incl_cond, include}]}, - {app, couch_index, [{incl_cond, include}]}, - {app, couch_mrview, [{incl_cond, include}]}, - {app, couch_replicator, [{incl_cond, include}]}, - {app, couch_dbupdates, [{incl_cond, include}]}, - {app, couch_pluguns, [{incl_cond, include}]} - - ]}. - -{target_dir, "apache-couchdb"}. - -{overlay_vars, "vars.config"}. - -{overlay, [ - {mkdir, "log"}, - {mkdir, "run"}, - {mkdir, "data"}, - - %% keep empty files - {copy, "files/empty", "log/KEEP"}, - {copy, "files/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/couch"}, - {template, "../deps/node_package/priv/base/env.sh", "lib/env.sh"}, - - - %% config files - {template, "files/app.config", "etc/app.config"}, - {template, "files/vm.args", "etc/vm.args"}, - {template, "files/couch.ini", "etc/couch.ini"}, - {template, "files/local.ini", "etc/local.ini"}, - - %% couchdb data files - {copy, "../share"}, - {copy, "../apps/couch/couchjs", "bin/couchjs"}, - - %% misc - {mkdir, "lib/couch-patches"}, - {copy, "../apps/couch_rel/ebin/etop_txt.beam", "lib/couch-patches"} - -]}. +CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"), + +[ + {sys, [ + {lib_dirs, ["../deps", "../apps"]}, + {rel, "couchdb", Vsn, + [ + kernel, + stdlib, + sasl, + public_key, + ssl, + os_mon, + crypto, + inets, + xmerl, + runtime_tools, + mochiweb, + ibrowse, + oauth, + jiffy, + snappy, + couch, + couch_collate, + couch_index, + couch_mrview, + couch_replicator, + couch_dbupdates + ]}, + {rel, "start_clean", "", [kernel, stdlib]}, + {boot_rel, "couchdb"}, + {profile, embedded}, + {relocatable, true}, + {app_file, strip}, + {debug_info, strip}, + {incl_cond, exclude}, + + {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)"]}, + {excl_archive_filters, [".*"]}, + + %% stdlib + {app, asn1, [{incl_cond, include}]}, + {app, sasl, [{incl_cond, include}]}, + {app, crypto, [{incl_cond, include}]}, + {app, public_key, [{incl_cond, include}]}, + {app, ssl, [{incl_cond, include}]}, + {app, xmerl, [{incl_cond, include}]}, + + {app, kernel, [{incl_cond, include}]}, + {app, stdlib, [{incl_cond, include}]}, + {app, inets, [{incl_cond, include}]}, + {app, os_mon, [{incl_cond, include}]}, + {app, compiler, [{incl_cond, include}]}, + {app, syntax_tools, [{incl_cond, include}]}, + {app, runtime_tools, [{incl_cond, include}]}, + + %% dependencies + {app, mochiweb, [{incl_cond, include}]}, + {app, oauth, [{incl_cond, include}]}, + {app, jiffy, [{incl_cond, include}]}, + {app, snappy, [{incl_cond, include}]}, + {app, ibrowse, [{incl_cond, include}]}, + + %% couchdb + {app, couch, [{incl_cond, include}]}, + {app, couch_collate, [{incl_cond, include}]}, + {app, couch_index, [{incl_cond, include}]}, + {app, couch_mrview, [{incl_cond, include}]}, + {app, couch_replicator, [{incl_cond, include}]}, + {app, couch_dbupdates, [{incl_cond, include}]}, + {app, couch_plugins, [{incl_cond, include}]} + + ]}, + + {target_dir, "apache-couchdb"}, + + {overlay_vars, "vars.config"}, + + {overlay, [ + {mkdir, "log"}, + {mkdir, "run"}, + {mkdir, "data"}, + + %% keep empty files + {copy, "files/empty", "log/KEEP"}, + {copy, "files/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"}, + + + %% config files + {template, "files/app.config", "etc/app.config"}, + {template, "files/vm.args", "etc/vm.args"}, + {template, "files/couch.ini", "etc/couch.ini"}, + {template, "files/local.ini", "etc/local.ini"}, + + %% couchdb data files + {copy, "../share"}, + {copy, "../apps/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName}, + + %% misc + {mkdir, "lib/couch-patches"}, + {copy, "../apps/couch_rel/ebin/etop_txt.beam", "lib/couch-patches"} + + ]} +].