reorganize couch .erl and driver code into rebar layout

60 files changed, 0 insertions, 201 deletions

diff --git a/src/couchdb/priv/icu_driver/couch_icu_driver.c b/apps/couch/c_src/couch_icu_driver.c
index 1afe8eac..1afe8eac 100644
--- a/src/couchdb/priv/icu_driver/couch_icu_driver.c
+++ b/apps/couch/c_src/couch_icu_driver.c
diff --git a/src/couchdb/couch_db.hrl b/apps/couch/include/couch_db.hrl
index a35745ef..a35745ef 100644
--- a/src/couchdb/couch_db.hrl
+++ b/apps/couch/include/couch_db.hrl
diff --git a/src/couchdb/priv/spawnkillable/couchspawnkillable.sh b/apps/couch/priv/couchspawnkillable.sh
index f8d042e3..f8d042e3 100644
--- a/src/couchdb/priv/spawnkillable/couchspawnkillable.sh
+++ b/apps/couch/priv/couchspawnkillable.sh
diff --git a/src/couchdb/priv/stat_descriptions.cfg.in b/apps/couch/priv/stat_descriptions.cfg
index 5c972ddf..5c972ddf 100644
--- a/src/couchdb/priv/stat_descriptions.cfg.in
+++ b/apps/couch/priv/stat_descriptions.cfg
diff --git a/src/couchdb/couch.app.tpl.in b/apps/couch/src/couch.app.src
index 36b0b34c..36b0b34c 100644
--- a/src/couchdb/couch.app.tpl.in
+++ b/apps/couch/src/couch.app.src
diff --git a/src/couchdb/couch.erl b/apps/couch/src/couch.erl
index 956e9489..956e9489 100644
--- a/src/couchdb/couch.erl
+++ b/apps/couch/src/couch.erl
diff --git a/src/couchdb/couch_app.erl b/apps/couch/src/couch_app.erl
index 232953d9..232953d9 100644
--- a/src/couchdb/couch_app.erl
+++ b/apps/couch/src/couch_app.erl
diff --git a/src/couchdb/couch_auth_cache.erl b/apps/couch/src/couch_auth_cache.erl
index 078bfcc1..078bfcc1 100644
--- a/src/couchdb/couch_auth_cache.erl
+++ b/apps/couch/src/couch_auth_cache.erl
diff --git a/src/couchdb/couch_btree.erl b/apps/couch/src/couch_btree.erl
index 0e47bac7..0e47bac7 100644
--- a/src/couchdb/couch_btree.erl
+++ b/apps/couch/src/couch_btree.erl
diff --git a/src/couchdb/couch_changes.erl b/apps/couch/src/couch_changes.erl
index 3a5bc4f8..3a5bc4f8 100644
--- a/src/couchdb/couch_changes.erl
+++ b/apps/couch/src/couch_changes.erl
diff --git a/src/couchdb/couch_config.erl b/apps/couch/src/couch_config.erl
index be53e3a3..be53e3a3 100644
--- a/src/couchdb/couch_config.erl
+++ b/apps/couch/src/couch_config.erl
diff --git a/src/couchdb/couch_config_writer.erl b/apps/couch/src/couch_config_writer.erl
index c8691d79..c8691d79 100644
--- a/src/couchdb/couch_config_writer.erl
+++ b/apps/couch/src/couch_config_writer.erl
diff --git a/src/couchdb/couch_db.erl b/apps/couch/src/couch_db.erl
index 7678f6ca..7678f6ca 100644
--- a/src/couchdb/couch_db.erl
+++ b/apps/couch/src/couch_db.erl
diff --git a/src/couchdb/couch_db_update_notifier.erl b/apps/couch/src/couch_db_update_notifier.erl
index 150eb31b..150eb31b 100644
--- a/src/couchdb/couch_db_update_notifier.erl
+++ b/apps/couch/src/couch_db_update_notifier.erl
diff --git a/src/couchdb/couch_db_update_notifier_sup.erl b/apps/couch/src/couch_db_update_notifier_sup.erl
index 4d730fc7..4d730fc7 100644
--- a/src/couchdb/couch_db_update_notifier_sup.erl
+++ b/apps/couch/src/couch_db_update_notifier_sup.erl
diff --git a/src/couchdb/couch_db_updater.erl b/apps/couch/src/couch_db_updater.erl
index 19a4c165..19a4c165 100644
--- a/src/couchdb/couch_db_updater.erl
+++ b/apps/couch/src/couch_db_updater.erl
diff --git a/src/couchdb/couch_doc.erl b/apps/couch/src/couch_doc.erl
index d15cd7de..d15cd7de 100644
--- a/src/couchdb/couch_doc.erl
+++ b/apps/couch/src/couch_doc.erl
diff --git a/src/couchdb/couch_event_sup.erl b/apps/couch/src/couch_event_sup.erl
index 6fd6963a..6fd6963a 100644
--- a/src/couchdb/couch_event_sup.erl
+++ b/apps/couch/src/couch_event_sup.erl
diff --git a/src/couchdb/couch_external_manager.erl b/apps/couch/src/couch_external_manager.erl
index 7e401389..7e401389 100644
--- a/src/couchdb/couch_external_manager.erl
+++ b/apps/couch/src/couch_external_manager.erl
diff --git a/src/couchdb/couch_external_server.erl b/apps/couch/src/couch_external_server.erl
index 045fcee9..045fcee9 100644
--- a/src/couchdb/couch_external_server.erl
+++ b/apps/couch/src/couch_external_server.erl
diff --git a/src/couchdb/couch_file.erl b/apps/couch/src/couch_file.erl
index 0a891712..0a891712 100644
--- a/src/couchdb/couch_file.erl
+++ b/apps/couch/src/couch_file.erl
diff --git a/src/couchdb/couch_httpd.erl b/apps/couch/src/couch_httpd.erl
index 8a5c699a..8a5c699a 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/apps/couch/src/couch_httpd.erl
diff --git a/src/couchdb/couch_httpd_auth.erl b/apps/couch/src/couch_httpd_auth.erl
index 7023e7f3..7023e7f3 100644
--- a/src/couchdb/couch_httpd_auth.erl
+++ b/apps/couch/src/couch_httpd_auth.erl
diff --git a/src/couchdb/couch_httpd_db.erl b/apps/couch/src/couch_httpd_db.erl
index cf4e2120..cf4e2120 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/apps/couch/src/couch_httpd_db.erl
diff --git a/src/couchdb/couch_httpd_external.erl b/apps/couch/src/couch_httpd_external.erl
index 07202934..07202934 100644
--- a/src/couchdb/couch_httpd_external.erl
+++ b/apps/couch/src/couch_httpd_external.erl
diff --git a/src/couchdb/couch_httpd_misc_handlers.erl b/apps/couch/src/couch_httpd_misc_handlers.erl
index 0a6f4a42..0a6f4a42 100644
--- a/src/couchdb/couch_httpd_misc_handlers.erl
+++ b/apps/couch/src/couch_httpd_misc_handlers.erl
diff --git a/src/couchdb/couch_httpd_oauth.erl b/apps/couch/src/couch_httpd_oauth.erl
index 05ee10e2..05ee10e2 100644
--- a/src/couchdb/couch_httpd_oauth.erl
+++ b/apps/couch/src/couch_httpd_oauth.erl
diff --git a/src/couchdb/couch_httpd_rewrite.erl b/apps/couch/src/couch_httpd_rewrite.erl
index ca4ac1f0..ca4ac1f0 100644
--- a/src/couchdb/couch_httpd_rewrite.erl
+++ b/apps/couch/src/couch_httpd_rewrite.erl
diff --git a/src/couchdb/couch_httpd_show.erl b/apps/couch/src/couch_httpd_show.erl
index d50ca83a..d50ca83a 100644
--- a/src/couchdb/couch_httpd_show.erl
+++ b/apps/couch/src/couch_httpd_show.erl
diff --git a/src/couchdb/couch_httpd_stats_handlers.erl b/apps/couch/src/couch_httpd_stats_handlers.erl
index 41aeaed0..41aeaed0 100644
--- a/src/couchdb/couch_httpd_stats_handlers.erl
+++ b/apps/couch/src/couch_httpd_stats_handlers.erl
diff --git a/src/couchdb/couch_httpd_view.erl b/apps/couch/src/couch_httpd_view.erl
index e1a0dfad..e1a0dfad 100644
--- a/src/couchdb/couch_httpd_view.erl
+++ b/apps/couch/src/couch_httpd_view.erl
diff --git a/src/couchdb/couch_js_functions.hrl b/apps/couch/src/couch_js_functions.hrl
index 1f314f6e..1f314f6e 100644
--- a/src/couchdb/couch_js_functions.hrl
+++ b/apps/couch/src/couch_js_functions.hrl
diff --git a/src/couchdb/couch_key_tree.erl b/apps/couch/src/couch_key_tree.erl
index 4fe09bf3..4fe09bf3 100644
--- a/src/couchdb/couch_key_tree.erl
+++ b/apps/couch/src/couch_key_tree.erl
diff --git a/src/couchdb/couch_log.erl b/apps/couch/src/couch_log.erl
index 2d62cbb5..2d62cbb5 100644
--- a/src/couchdb/couch_log.erl
+++ b/apps/couch/src/couch_log.erl
diff --git a/src/couchdb/couch_native_process.erl b/apps/couch/src/couch_native_process.erl
index b512f712..b512f712 100644
--- a/src/couchdb/couch_native_process.erl
+++ b/apps/couch/src/couch_native_process.erl
diff --git a/src/couchdb/couch_os_process.erl b/apps/couch/src/couch_os_process.erl
index 5776776b..5776776b 100644
--- a/src/couchdb/couch_os_process.erl
+++ b/apps/couch/src/couch_os_process.erl
diff --git a/src/couchdb/couch_query_servers.erl b/apps/couch/src/couch_query_servers.erl
index c4f1bf0b..c4f1bf0b 100644
--- a/src/couchdb/couch_query_servers.erl
+++ b/apps/couch/src/couch_query_servers.erl
diff --git a/src/couchdb/couch_ref_counter.erl b/apps/couch/src/couch_ref_counter.erl
index 5a111ab6..5a111ab6 100644
--- a/src/couchdb/couch_ref_counter.erl
+++ b/apps/couch/src/couch_ref_counter.erl
diff --git a/src/couchdb/couch_rep.erl b/apps/couch/src/couch_rep.erl
index 65573e8c..65573e8c 100644
--- a/src/couchdb/couch_rep.erl
+++ b/apps/couch/src/couch_rep.erl
diff --git a/src/couchdb/couch_rep_att.erl b/apps/couch/src/couch_rep_att.erl
index 28b8945c..28b8945c 100644
--- a/src/couchdb/couch_rep_att.erl
+++ b/apps/couch/src/couch_rep_att.erl
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/apps/couch/src/couch_rep_changes_feed.erl
index 4c7dc35a..4c7dc35a 100644
--- a/src/couchdb/couch_rep_changes_feed.erl
+++ b/apps/couch/src/couch_rep_changes_feed.erl
diff --git a/src/couchdb/couch_rep_httpc.erl b/apps/couch/src/couch_rep_httpc.erl
index 768d88a3..768d88a3 100644
--- a/src/couchdb/couch_rep_httpc.erl
+++ b/apps/couch/src/couch_rep_httpc.erl
diff --git a/src/couchdb/couch_rep_missing_revs.erl b/apps/couch/src/couch_rep_missing_revs.erl
index 1eff6774..1eff6774 100644
--- a/src/couchdb/couch_rep_missing_revs.erl
+++ b/apps/couch/src/couch_rep_missing_revs.erl
diff --git a/src/couchdb/couch_rep_reader.erl b/apps/couch/src/couch_rep_reader.erl
index 3edc1f37..3edc1f37 100644
--- a/src/couchdb/couch_rep_reader.erl
+++ b/apps/couch/src/couch_rep_reader.erl
diff --git a/src/couchdb/couch_rep_sup.erl b/apps/couch/src/couch_rep_sup.erl
index 1318c598..1318c598 100644
--- a/src/couchdb/couch_rep_sup.erl
+++ b/apps/couch/src/couch_rep_sup.erl
diff --git a/src/couchdb/couch_rep_writer.erl b/apps/couch/src/couch_rep_writer.erl
index dd6396fd..dd6396fd 100644
--- a/src/couchdb/couch_rep_writer.erl
+++ b/apps/couch/src/couch_rep_writer.erl
diff --git a/src/couchdb/couch_server.erl b/apps/couch/src/couch_server.erl
index 43fd9044..43fd9044 100644
--- a/src/couchdb/couch_server.erl
+++ b/apps/couch/src/couch_server.erl
diff --git a/src/couchdb/couch_server_sup.erl b/apps/couch/src/couch_server_sup.erl
index 4f0445da..4f0445da 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/apps/couch/src/couch_server_sup.erl
diff --git a/src/couchdb/couch_stats_aggregator.erl b/apps/couch/src/couch_stats_aggregator.erl
index 6090355d..6090355d 100644
--- a/src/couchdb/couch_stats_aggregator.erl
+++ b/apps/couch/src/couch_stats_aggregator.erl
diff --git a/src/couchdb/couch_stats_collector.erl b/apps/couch/src/couch_stats_collector.erl
index f7b9bb48..f7b9bb48 100644
--- a/src/couchdb/couch_stats_collector.erl
+++ b/apps/couch/src/couch_stats_collector.erl
diff --git a/src/couchdb/couch_stream.erl b/apps/couch/src/couch_stream.erl
index 04c17770..04c17770 100644
--- a/src/couchdb/couch_stream.erl
+++ b/apps/couch/src/couch_stream.erl
diff --git a/src/couchdb/couch_task_status.erl b/apps/couch/src/couch_task_status.erl
index c4487dc4..c4487dc4 100644
--- a/src/couchdb/couch_task_status.erl
+++ b/apps/couch/src/couch_task_status.erl
diff --git a/src/couchdb/couch_util.erl b/apps/couch/src/couch_util.erl
index 8217a268..8217a268 100644
--- a/src/couchdb/couch_util.erl
+++ b/apps/couch/src/couch_util.erl
diff --git a/src/couchdb/couch_uuids.erl b/apps/couch/src/couch_uuids.erl
index e1851e1d..e1851e1d 100644
--- a/src/couchdb/couch_uuids.erl
+++ b/apps/couch/src/couch_uuids.erl
diff --git a/src/couchdb/couch_view.erl b/apps/couch/src/couch_view.erl
index 38c0a783..38c0a783 100644
--- a/src/couchdb/couch_view.erl
+++ b/apps/couch/src/couch_view.erl
diff --git a/src/couchdb/couch_view_compactor.erl b/apps/couch/src/couch_view_compactor.erl
index 895556bf..895556bf 100644
--- a/src/couchdb/couch_view_compactor.erl
+++ b/apps/couch/src/couch_view_compactor.erl
diff --git a/src/couchdb/couch_view_group.erl b/apps/couch/src/couch_view_group.erl
index f01befdf..f01befdf 100644
--- a/src/couchdb/couch_view_group.erl
+++ b/apps/couch/src/couch_view_group.erl
diff --git a/src/couchdb/couch_view_updater.erl b/apps/couch/src/couch_view_updater.erl
index 2a9c960f..2a9c960f 100644
--- a/src/couchdb/couch_view_updater.erl
+++ b/apps/couch/src/couch_view_updater.erl
diff --git a/src/couchdb/couch_work_queue.erl b/apps/couch/src/couch_work_queue.erl
index decfcad8..decfcad8 100644
--- a/src/couchdb/couch_work_queue.erl
+++ b/apps/couch/src/couch_work_queue.erl
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
deleted file mode 100644
index 308a3837..00000000
--- a/src/couchdb/Makefile.am
+++ /dev/null
@@ -1,201 +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.
-
-SUBDIRS = priv
-
-# devdocdir = $(localdocdir)/developer/couchdb
-couchlibdir = $(localerlanglibdir)/couch-$(version)
-couchincludedir = $(couchlibdir)/include
-couchebindir = $(couchlibdir)/ebin
-
-couchinclude_DATA = couch_db.hrl couch_js_functions.hrl
-couchebin_DATA = $(compiled_files)
-
-# dist_devdoc_DATA = $(doc_base) $(doc_modules)
-
-CLEANFILES = $(compiled_files) $(doc_base)
-
-# CLEANFILES = $(doc_modules) edoc-info
-
-source_files = \
-    couch.erl \
-    couch_app.erl \
-    couch_auth_cache.erl \
-    couch_btree.erl \
-    couch_changes.erl \
-    couch_config.erl \
-    couch_config_writer.erl \
-    couch_db.erl \
-    couch_db_update_notifier.erl \
-    couch_db_update_notifier_sup.erl \
-    couch_doc.erl \
-    couch_event_sup.erl \
-    couch_external_manager.erl \
-    couch_external_server.erl \
-    couch_file.erl \
-    couch_httpd.erl \
-    couch_httpd_db.erl \
-    couch_httpd_auth.erl \
-    couch_httpd_oauth.erl \
-    couch_httpd_external.erl \
-    couch_httpd_show.erl \
-    couch_httpd_view.erl \
-    couch_httpd_misc_handlers.erl \
-	couch_httpd_rewrite.erl \
-    couch_httpd_stats_handlers.erl \
-    couch_key_tree.erl \
-    couch_log.erl \
-    couch_native_process.erl \
-    couch_os_process.erl \
-    couch_query_servers.erl \
-    couch_ref_counter.erl \
-    couch_rep.erl \
-    couch_rep_att.erl \
-    couch_rep_changes_feed.erl \
-    couch_rep_httpc.erl \
-    couch_rep_missing_revs.erl \
-    couch_rep_reader.erl \
-    couch_rep_sup.erl \
-    couch_rep_writer.erl \
-    couch_server.erl \
-    couch_server_sup.erl \
-    couch_stats_aggregator.erl \
-    couch_stats_collector.erl \
-    couch_stream.erl \
-    couch_task_status.erl \
-    couch_util.erl \
-    couch_uuids.erl \
-    couch_view.erl \
-    couch_view_compactor.erl \
-    couch_view_updater.erl \
-    couch_view_group.erl \
-    couch_db_updater.erl \
-    couch_work_queue.erl
-
-EXTRA_DIST = $(source_files) couch_db.hrl couch_js_functions.hrl
-
-compiled_files = \
-    couch.app \
-    couch.beam \
-    couch_app.beam \
-    couch_auth_cache.beam \
-    couch_btree.beam \
-    couch_changes.beam \
-    couch_config.beam \
-    couch_config_writer.beam \
-    couch_db.beam \
-    couch_db_update_notifier.beam \
-    couch_db_update_notifier_sup.beam \
-    couch_doc.beam \
-    couch_event_sup.beam \
-    couch_external_manager.beam \
-    couch_external_server.beam \
-    couch_file.beam \
-    couch_httpd.beam \
-    couch_httpd_db.beam \
-    couch_httpd_auth.beam \
-    couch_httpd_oauth.beam \
-    couch_httpd_external.beam \
-    couch_httpd_show.beam \
-    couch_httpd_view.beam \
-    couch_httpd_misc_handlers.beam \
-	couch_httpd_rewrite.beam \
-    couch_httpd_stats_handlers.beam \
-    couch_key_tree.beam \
-    couch_log.beam \
-    couch_native_process.beam \
-    couch_os_process.beam \
-    couch_query_servers.beam \
-    couch_ref_counter.beam \
-    couch_rep.beam \
-    couch_rep_att.beam \
-    couch_rep_changes_feed.beam \
-    couch_rep_httpc.beam \
-    couch_rep_missing_revs.beam \
-    couch_rep_reader.beam \
-    couch_rep_sup.beam \
-    couch_rep_writer.beam \
-    couch_server.beam \
-    couch_server_sup.beam \
-    couch_stats_aggregator.beam \
-    couch_stats_collector.beam \
-    couch_stream.beam \
-    couch_task_status.beam \
-    couch_util.beam \
-    couch_uuids.beam \
-    couch_view.beam \
-    couch_view_compactor.beam \
-    couch_view_updater.beam \
-    couch_view_group.beam \
-    couch_db_updater.beam \
-    couch_work_queue.beam
-
-# doc_base = \
-#     erlang.png \
-#     index.html \
-#     modules-frame.html \
-#     overview-summary.html \
-#     packages-frame.html \
-#     stylesheet.css
-
-# doc_modules = \
-#     couch_btree.html \
-#     couch_config.html \
-#     couch_config_writer.html \
-#     couch_db.html \
-#     couch_db_update_notifier.html \
-#     couch_db_update_notifier_sup.html \
-#     couch_doc.html \
-#     couch_event_sup.html \
-#     couch_file.html \
-#     couch_httpd.html \
-#     couch_key_tree.html \
-#     couch_log.html \
-#     couch_query_servers.html \
-#     couch_rep.html \
-#     couch_rep_sup.html \
-#     couch_server.html \
-#     couch_server_sup.html \
-#     couch_stream.html \
-#     couch_util.html \
-#     couch_view.html
-
-if WINDOWS
-couch.app: couch.app.tpl
-	modules=`find . -name "couch*.erl" -exec basename {} .erl \; | tr '\n' ',' | sed "s/,$$//"`; \
-	sed -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|@modules@|$$modules|g" \
-	    -e "s|%localconfdir%|../etc/couchdb|g" \
-	    -e "s|@defaultini@|default.ini|g" \
-	    -e "s|@localini@|local.ini|g" > \
-	$@ < $<
-else
-couch.app: couch.app.tpl
-	modules=`{ find . -name "*.erl" -exec basename {} .erl \; | tr '\n' ','; echo ''; } | sed "s/,$$//"`; \
-	sed -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|@modules@|$$modules|g" \
-	    -e "s|%localconfdir%|@localconfdir@|g" \
-	    -e "s|@defaultini@|default.ini|g" \
-	    -e "s|@localini@|local.ini|g" > \
-	$@ < $<
-	chmod +x $@
-endif
-
-# $(dist_devdoc_DATA): edoc-info
-
-# $(ERL) -noshell -run edoc_run files [\"$<\"]
-
-%.beam: %.erl couch_db.hrl couch_js_functions.hrl
-	$(ERLC) $(ERLC_FLAGS) ${TEST} $<;
-