couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [50/50] git commit: Build with rebar
Date Sat, 18 Jan 2014 00:48:15 GMT
Build with rebar


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/168259d6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/168259d6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/168259d6

Branch: refs/heads/import
Commit: 168259d684b40e332eaab505c676d31267c78626
Parents: 06a8d7d
Author: Robert Newson <rnewson@apache.org>
Authored: Wed Dec 18 14:04:59 2013 +0000
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Fri Jan 17 16:44:44 2014 -0800

----------------------------------------------------------------------
 Makefile.am          | 204 ----------------------------------------------
 priv/Makefile.am     | 159 ------------------------------------
 src/couch.app.src    |  22 +++++
 src/couch.app.tpl.in |  26 ------
 4 files changed, 22 insertions(+), 389 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/168259d6/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 9a656f7..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,204 +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 = include/couch_db.hrl src/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 = \
-    src/couch.erl \
-    src/couch_app.erl \
-    src/couch_auth_cache.erl \
-    src/couch_btree.erl \
-    src/couch_changes.erl \
-    src/couch_compaction_daemon.erl \
-    src/couch_compress.erl \
-    src/couch_config.erl \
-    src/couch_config_writer.erl \
-    src/couch_db.erl \
-    src/couch_db_update_notifier.erl \
-    src/couch_db_update_notifier_sup.erl \
-    src/couch_doc.erl \
-    src/couch_drv.erl \
-    src/couch_ejson_compare.erl \
-    src/couch_emsort.erl \
-    src/couch_event_sup.erl \
-    src/couch_external_manager.erl \
-    src/couch_external_server.erl \
-    src/couch_file.erl \
-    src/couch_httpd.erl \
-    src/couch_httpd_db.erl \
-    src/couch_httpd_auth.erl \
-    src/couch_httpd_cors.erl \
-    src/couch_httpd_oauth.erl \
-    src/couch_httpd_external.erl \
-    src/couch_httpd_misc_handlers.erl \
-    src/couch_httpd_proxy.erl \
-    src/couch_httpd_rewrite.erl \
-    src/couch_httpd_stats_handlers.erl \
-    src/couch_httpd_vhost.erl \
-    src/couch_key_tree.erl \
-    src/couch_log.erl \
-	src/couch_lru.erl \
-    src/couch_native_process.erl \
-    src/couch_os_daemons.erl \
-    src/couch_os_process.erl \
-    src/couch_passwords.erl \
-    src/couch_primary_sup.erl \
-	src/couch_proc_manager.erl \
-    src/couch_query_servers.erl \
-    src/couch_secondary_sup.erl \
-    src/couch_server.erl \
-    src/couch_stats_aggregator.erl \
-    src/couch_stats_collector.erl \
-    src/couch_stream.erl \
-    src/couch_sup.erl \
-    src/couch_task_status.erl \
-    src/couch_users_db.erl \
-    src/couch_util.erl \
-    src/couch_uuids.erl \
-    src/couch_db_updater.erl \
-    src/couch_work_queue.erl
-
-EXTRA_DIST = \
-	$(source_files) \
-	include/couch_db.hrl \
-	src/couch_js_functions.hrl
-
-compiled_files = \
-    ebin/couch.app \
-    ebin/couch.beam \
-    ebin/couch_app.beam \
-    ebin/couch_auth_cache.beam \
-    ebin/couch_btree.beam \
-    ebin/couch_changes.beam \
-    ebin/couch_compaction_daemon.beam \
-    ebin/couch_compress.beam \
-    ebin/couch_config.beam \
-    ebin/couch_config_writer.beam \
-    ebin/couch_db.beam \
-    ebin/couch_db_update_notifier.beam \
-    ebin/couch_db_update_notifier_sup.beam \
-    ebin/couch_doc.beam \
-    ebin/couch_drv.beam \
-    ebin/couch_ejson_compare.beam \
-    ebin/couch_emsort.beam \
-    ebin/couch_event_sup.beam \
-    ebin/couch_external_manager.beam \
-    ebin/couch_external_server.beam \
-    ebin/couch_file.beam \
-    ebin/couch_httpd.beam \
-    ebin/couch_httpd_db.beam \
-    ebin/couch_httpd_auth.beam \
-    ebin/couch_httpd_oauth.beam \
-    ebin/couch_httpd_cors.beam \
-    ebin/couch_httpd_proxy.beam \
-    ebin/couch_httpd_external.beam \
-    ebin/couch_httpd_misc_handlers.beam \
-    ebin/couch_httpd_rewrite.beam \
-    ebin/couch_httpd_stats_handlers.beam \
-    ebin/couch_httpd_vhost.beam \
-    ebin/couch_key_tree.beam \
-    ebin/couch_log.beam \
-	ebin/couch_lru.beam \
-    ebin/couch_native_process.beam \
-    ebin/couch_os_daemons.beam \
-    ebin/couch_os_process.beam \
-    ebin/couch_passwords.beam \
-    ebin/couch_primary_sup.beam \
-	ebin/couch_proc_manager.beam \
-    ebin/couch_query_servers.beam \
-    ebin/couch_secondary_sup.beam \
-    ebin/couch_server.beam \
-    ebin/couch_stats_aggregator.beam \
-    ebin/couch_stats_collector.beam \
-    ebin/couch_stream.beam \
-    ebin/couch_sup.beam \
-    ebin/couch_task_status.beam \
-    ebin/couch_users_db.beam \
-    ebin/couch_util.beam \
-    ebin/couch_uuids.beam \
-    ebin/couch_db_updater.beam \
-    ebin/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_stream.html \
-#     couch_util.html
-
-if WINDOWS
-ebin/couch.app: src/couch.app.tpl
-	@mkdir -p ebin/
-	modules=`find ./src -name "*.erl" \! -name ".*" -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
-ebin/couch.app: src/couch.app.tpl
-	@mkdir -p ebin/
-	modules=`{ find ./src -name "*.erl" \! -name ".*" -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" > \
-	$@ < $<
-endif
-
-# $(dist_devdoc_DATA): edoc-info
-
-# $(ERL) -noshell -run edoc_run files [\"$<\"]
-
-ebin/%.beam: src/%.erl include/couch_db.hrl src/couch_js_functions.hrl
-	@mkdir -p ebin/
-	$(ERLC) -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
-

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/168259d6/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/priv/Makefile.am b/priv/Makefile.am
deleted file mode 100644
index ced9bec..0000000
--- a/priv/Makefile.am
+++ /dev/null
@@ -1,159 +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.
-
-MAKE_SAFE = $(MAKE)
-
-couchlibdir = $(localerlanglibdir)/couch-$(version)
-couchprivdir = $(couchlibdir)/priv
-couchprivlibdir = $(couchlibdir)/priv/lib
-man1dir = $(mandir)/man1
-
-man_file = couchjs.1
-
-if BUILD_MAN
-man_file_build = $(man_file)
-else
-man_file_build =
-endif
-
-BUILT_SOURCES = $(man_file_build)
-
-EXTRA_DIST = \
-	spawnkillable/couchspawnkillable.sh \
-	stat_descriptions.cfg.in \
-	couch_ejson_compare/erl_nif_compat.h \
-	couch_js/sm170.c \
-	couch_js/sm180.c \
-	couch_js/sm185.c \
-	$(man_file_build)
-
-CLEANFILES = $(man_file_build) stat_descriptions.cfg
-
-couchprivlib_LTLIBRARIES = couch_icu_driver.la
-if USE_EJSON_COMPARE_NIF
-couchprivlib_LTLIBRARIES += couch_ejson_compare.la
-couch_ejson_compare_la_SOURCES = couch_ejson_compare/couch_ejson_compare.c
-couch_ejson_compare_la_CPPFLAGS = -D_BSD_SOURCE $(ICU_CPPFLAGS) $(ERLANG_FLAGS)
-couch_ejson_compare_la_LDFLAGS = -module -avoid-version
-couch_ejson_compare_la_LIBADD = $(ICU_LIBS)
-if WINDOWS
-couch_ejson_compare_la_LDFLAGS += -no-undefined
-endif
-endif
-couch_icu_driver_la_SOURCES = icu_driver/couch_icu_driver.c
-couch_icu_driver_la_LDFLAGS = -module -avoid-version
-couch_icu_driver_la_CPPFLAGS = $(ICU_CPPFLAGS) $(ERLANG_FLAGS)
-couch_icu_driver_la_LIBADD = $(ICU_LIBS)
-
-if WINDOWS
-couch_icu_driver_la_LDFLAGS += -no-undefined
-couch_icu_driver_so_name = couch_icu_driver.dll
-else
-couch_icu_driver_so_name = couch_icu_driver.so
-endif
-
-$(couch_icu_driver_so_name): couch_icu_driver.la
-	cp .libs/$(couch_icu_driver_so_name) $@
-
-all: $(couch_icu_driver_so_name)
-
-COUCHJS_SRCS = \
-	couch_js/help.h \
-	couch_js/http.c \
-	couch_js/http.h \
-	couch_js/main.c \
-	couch_js/utf8.c \
-	couch_js/utf8.h \
-	couch_js/util.h \
-	couch_js/util.c
-
-locallibbin_PROGRAMS = couchjs
-couchjs_SOURCES = $(COUCHJS_SRCS)
-couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE $(CURL_CFLAGS) $(JS_CFLAGS)
-couchjs_LDADD = $(CURL_LIBS) $(JS_LIBS)
-
-couchpriv_DATA = stat_descriptions.cfg
-couchpriv_PROGRAMS = couchspawnkillable
-
-# Depend on source files so distributed man pages are not rebuilt for end user.
-
-$(man_file): $(COUCHJS_SRCS)
-	$(MAKE_SAFE) -f Makefile couchjs; \
-	$(top_srcdir)/build-aux/missing --run \
-	    help2man \
-	        --no-info \
-	        --help-option="-h" \
-	        --version-option="-V" \
-	        --name="$(package_name) JavaScript interpreter" \
-	        ./couchjs --output $@
-
-install-data-local:
-	if test -s $(man_file); then \
-	    if test `cat $(man_file) | wc -l` -gt 1; then \
-	        $(INSTALL) -d $(DESTDIR)$(man1dir); \
-	        $(INSTALL_DATA) $(man_file) $(DESTDIR)$(man1dir)/$(man_file); \
-	    fi \
-	fi
-
-%.cfg: %.cfg.in
-	cp $< $@
-
-if WINDOWS
-couchspawnkillable_SOURCES = spawnkillable/couchspawnkillable_win.c
-endif
-
-if !WINDOWS
-couchspawnkillable: spawnkillable/couchspawnkillable.sh
-	cp $< $@
-	chmod +x $@
-endif
-
-# libtool and automake have defeated markh.  For each of our executables
-# we end up with 2 copies - one directly in the 'target' folder (eg, 'priv')
-# and another - the correct one - in .libs.  The former doesn't work but is
-# what gets installed for 'couchspawnkillable' - but the correct one for
-# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the
-# correct one as the last step. See bug COUCHDB-439
-install-data-hook:
-	if test -f "$(DESTDIR)$(couchprivlibdir)/couch_icu_driver"; then \
-	    rm -f "$(DESTDIR)$(couchprivlibdir)/couch_icu_driver.so"; \
-	    cd "$(DESTDIR)$(couchprivlibdir)" && \
-	        $(LN_S) couch_icu_driver couch_icu_driver.so; \
-	fi
-	if test -f "$(DESTDIR)$(couchprivlibdir)/couch_ejson_compare_nif"; then \
-	    rm -f "$(DESTDIR)$(couchprivlibdir)/couch_ejson_compare_nif.so"; \
-	    cd "$(DESTDIR)$(couchprivlibdir)" && \
-	        $(LN_S) couch_ejson_compare_nif couch_ejson_compare_nif.so; \
-	fi
-if WINDOWS
-	$(INSTALL) $(ICU_BIN)/icuuc*.dll $(bindir)
-	$(INSTALL) $(ICU_BIN)/icudt*.dll $(bindir)
-	$(INSTALL) $(ICU_BIN)/icuin*.dll $(bindir)
-	$(INSTALL) $(JS_LIB_BINARY) $(bindir)
-	$(INSTALL) .libs/couchspawnkillable.exe \
-		"$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
-endif
-
-uninstall-local:
-	rm -f $(DESTDIR)$(man1dir)/$(man_file)
-	if test -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver"; then \
-	    rm -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver.so"; \
-	fi
-
-distcheck-hook:
-	if test ! -s $(man_file); then \
-	    $(top_srcdir)/build-aux/dist-error $(man_file); \
-	else \
-	    if test ! `cat $(man_file) | wc -l` -gt 1; then \
-	        $(top_srcdir)/build-aux/dist-error $(man_file); \
-	    fi \
-	fi

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/168259d6/src/couch.app.src
----------------------------------------------------------------------
diff --git a/src/couch.app.src b/src/couch.app.src
new file mode 100644
index 0000000..0cc3b54
--- /dev/null
+++ b/src/couch.app.src
@@ -0,0 +1,22 @@
+{application, couch, [
+    {description, "Apache CouchDB"},
+    {vsn, git},
+    {registered, [
+        couch_db_update,
+        couch_db_update_notifier_sup,
+        couch_external_manager,
+        couch_httpd,
+        couch_log,
+        couch_primary_services,
+        couch_proc_manager,
+        couch_secondary_services,
+        couch_server,
+        couch_sup,
+        couch_stats_aggregator,
+        couch_stats_collector,
+        couch_task_status
+    ]},
+    {mod, {couch_app, []}},
+    {applications, [kernel, stdlib, crypto, sasl, inets, oauth, ibrowse,
+        mochiweb, ssl, twig, couch_event]}
+]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/168259d6/src/couch.app.tpl.in
----------------------------------------------------------------------
diff --git a/src/couch.app.tpl.in b/src/couch.app.tpl.in
deleted file mode 100644
index 9b7536b..0000000
--- a/src/couch.app.tpl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-{application, couch, [
-    {description, "@package_name@"},
-    {vsn, "@version@"},
-    {modules, [@modules@]},
-    {registered, [
-        couch_db_update,
-        couch_db_update_notifier_sup,
-        couch_external_manager,
-        couch_httpd,
-        couch_log,
-        couch_primary_services,
-        couch_proc_manager,
-        couch_secondary_services,
-        couch_server,
-        couch_sup,
-        couch_stats_aggregator,
-        couch_stats_collector,
-        couch_task_status
-    ]},
-    {mod, {couch_app, [
-        "%localconfdir%/@defaultini@",
-        "%localconfdir%/@localini@"
-    ]}},
-    {applications, [kernel, stdlib, twig, config]},
-    {included_applications, [crypto, sasl, inets, oauth, ibrowse, mochiweb, os_mon]}
-]}.


Mime
View raw message