From e29a1924afe9e6051369f7bcbf44ccdf53de536a Mon Sep 17 00:00:00 2001 From: Paul Joseph Davis Date: Mon, 9 Nov 2009 00:39:16 +0000 Subject: Fixes 'make distcheck' to run the test suite. Quite a few changes to the build system to handle VPATH builds appropriately as well as make the test suite know about them. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@833951 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/priv/Makefile.am | 9 +++++++- src/couchdb/priv/stat_descriptions.cfg | 37 ------------------------------- src/couchdb/priv/stat_descriptions.cfg.in | 37 +++++++++++++++++++++++++++++++ src/erlang-oauth/Makefile.am | 15 +++++++------ src/erlang-oauth/oauth.app | 20 ----------------- src/erlang-oauth/oauth.app.in | 20 +++++++++++++++++ src/ibrowse/Makefile.am | 9 ++++---- src/ibrowse/ibrowse.app | 13 ----------- src/ibrowse/ibrowse.app.in | 13 +++++++++++ src/mochiweb/Makefile.am | 11 ++++----- src/mochiweb/mochiweb.app | 32 -------------------------- src/mochiweb/mochiweb.app.in | 32 ++++++++++++++++++++++++++ 12 files changed, 129 insertions(+), 119 deletions(-) delete mode 100644 src/couchdb/priv/stat_descriptions.cfg create mode 100644 src/couchdb/priv/stat_descriptions.cfg.in delete mode 100644 src/erlang-oauth/oauth.app create mode 100644 src/erlang-oauth/oauth.app.in delete mode 100644 src/ibrowse/ibrowse.app create mode 100644 src/ibrowse/ibrowse.app.in delete mode 100644 src/mochiweb/mochiweb.app create mode 100644 src/mochiweb/mochiweb.app.in (limited to 'src') diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am index 8c504dbc..fecaa64b 100644 --- a/src/couchdb/priv/Makefile.am +++ b/src/couchdb/priv/Makefile.am @@ -13,11 +13,18 @@ couchlibdir = $(localerlanglibdir)/couch-$(version) couchprivdir = $(couchlibdir)/priv -EXTRA_DIST = couchspawnkillable.sh stat_descriptions.cfg +EXTRA_DIST = \ + couchspawnkillable.sh \ + stat_descriptions.cfg.in + +CLEANFILES = stat_descriptions.cfg couchpriv_DATA = stat_descriptions.cfg couchpriv_PROGRAMS = couchspawnkillable +%.cfg: %.cfg.in + cp $< $@ + if WINDOWS couchspawnkillable_SOURCES = couchspawnkillable_win.c endif diff --git a/src/couchdb/priv/stat_descriptions.cfg b/src/couchdb/priv/stat_descriptions.cfg deleted file mode 100644 index 91a1540f..00000000 --- a/src/couchdb/priv/stat_descriptions.cfg +++ /dev/null @@ -1,37 +0,0 @@ -% 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 change"}. -{couchdb, database_reads, "number of times a document was read from a databas"}. -{couchdb, open_databases, "number of open database"}. -{couchdb, open_os_files, "number of file descriptors CouchDB has ope"}. -{couchdb, request_time, "length of a request inside CouchDB without MochiWe"}. - -{httpd, bulk_requests, "number of bulk request"}. -{httpd, requests, "number of HTTP request"}. -{httpd, temporary_view_reads, "number of temporary view read"}. -{httpd, view_reads, "number of view read"}. -{httpd, clients_requesting_changes, "number of clients for continuous _change"}. - -{httpd_request_methods, 'COPY', "number of HTTP COPY request"}. -{httpd_request_methods, 'DELETE', "number of HTTP DELETE request"}. -{httpd_request_methods, 'GET', "number of HTTP GET request"}. -{httpd_request_methods, 'HEAD', "number of HTTP HEAD request"}. -{httpd_request_methods, 'MOVE', "number of HTTP MOVE request"}. -{httpd_request_methods, 'POST', "number of HTTP POST request"}. -{httpd_request_methods, 'PUT', "number of HTTP PUT request"}. - -{httpd_status_codes, '200', "number of HTTP 200 OK response"}. -{httpd_status_codes, '201', "number of HTTP 201 Created response"}. -{httpd_status_codes, '202', "number of HTTP 202 Accepted response"}. -{httpd_status_codes, '301', "number of HTTP 301 Moved Permanently response"}. -{httpd_status_codes, '304', "number of HTTP 304 Not Modified response"}. -{httpd_status_codes, '400', "number of HTTP 400 Bad Request response"}. -{httpd_status_codes, '401', "number of HTTP 401 Unauthorized response"}. -{httpd_status_codes, '403', "number of HTTP 403 Forbidden response"}. -{httpd_status_codes, '404', "number of HTTP 404 Not Found response"}. -{httpd_status_codes, '405', "number of HTTP 405 Method Not Allowed response"}. -{httpd_status_codes, '409', "number of HTTP 409 Conflict response"}. -{httpd_status_codes, '412', "number of HTTP 412 Precondition Failed response"}. -{httpd_status_codes, '500', "number of HTTP 500 Internal Server Error response"}. diff --git a/src/couchdb/priv/stat_descriptions.cfg.in b/src/couchdb/priv/stat_descriptions.cfg.in new file mode 100644 index 00000000..91a1540f --- /dev/null +++ b/src/couchdb/priv/stat_descriptions.cfg.in @@ -0,0 +1,37 @@ +% 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 change"}. +{couchdb, database_reads, "number of times a document was read from a databas"}. +{couchdb, open_databases, "number of open database"}. +{couchdb, open_os_files, "number of file descriptors CouchDB has ope"}. +{couchdb, request_time, "length of a request inside CouchDB without MochiWe"}. + +{httpd, bulk_requests, "number of bulk request"}. +{httpd, requests, "number of HTTP request"}. +{httpd, temporary_view_reads, "number of temporary view read"}. +{httpd, view_reads, "number of view read"}. +{httpd, clients_requesting_changes, "number of clients for continuous _change"}. + +{httpd_request_methods, 'COPY', "number of HTTP COPY request"}. +{httpd_request_methods, 'DELETE', "number of HTTP DELETE request"}. +{httpd_request_methods, 'GET', "number of HTTP GET request"}. +{httpd_request_methods, 'HEAD', "number of HTTP HEAD request"}. +{httpd_request_methods, 'MOVE', "number of HTTP MOVE request"}. +{httpd_request_methods, 'POST', "number of HTTP POST request"}. +{httpd_request_methods, 'PUT', "number of HTTP PUT request"}. + +{httpd_status_codes, '200', "number of HTTP 200 OK response"}. +{httpd_status_codes, '201', "number of HTTP 201 Created response"}. +{httpd_status_codes, '202', "number of HTTP 202 Accepted response"}. +{httpd_status_codes, '301', "number of HTTP 301 Moved Permanently response"}. +{httpd_status_codes, '304', "number of HTTP 304 Not Modified response"}. +{httpd_status_codes, '400', "number of HTTP 400 Bad Request response"}. +{httpd_status_codes, '401', "number of HTTP 401 Unauthorized response"}. +{httpd_status_codes, '403', "number of HTTP 403 Forbidden response"}. +{httpd_status_codes, '404', "number of HTTP 404 Not Found response"}. +{httpd_status_codes, '405', "number of HTTP 405 Method Not Allowed response"}. +{httpd_status_codes, '409', "number of HTTP 409 Conflict response"}. +{httpd_status_codes, '412', "number of HTTP 412 Precondition Failed response"}. +{httpd_status_codes, '500', "number of HTTP 500 Internal Server Error response"}. diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am index c87d7f68..1d123396 100644 --- a/src/erlang-oauth/Makefile.am +++ b/src/erlang-oauth/Makefile.am @@ -16,6 +16,7 @@ oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin # we add a ./configure option to enable it. oauth_file_collection = \ + oauth.app.in \ oauth.erl \ oauth_hmac_sha1.erl \ oauth_http.erl \ @@ -23,9 +24,8 @@ oauth_file_collection = \ oauth_unix.erl \ oauth_uri.erl -oauthebin_static_file = oauth.app - oauthebin_make_generated_file_list = \ + oauth.app \ oauth.beam \ oauth_hmac_sha1.beam \ oauth_http.beam \ @@ -34,15 +34,16 @@ oauthebin_make_generated_file_list = \ oauth_uri.beam oauthebin_DATA = \ - $(oauthebin_static_file) \ - $(oauthebin_make_generated_file_list) + $(oauthebin_make_generated_file_list) -EXTRA_DIST = \ - $(oauth_file_collection) \ - $(oauthebin_static_file) +EXTRA_DIST = \ + $(oauth_file_collection) CLEANFILES = \ $(oauthebin_make_generated_file_list) +%.app: %.app.in + cp $< $@ + %.beam: %.erl $(ERLC) $(ERLC_FLAGS) $< diff --git a/src/erlang-oauth/oauth.app b/src/erlang-oauth/oauth.app deleted file mode 100644 index 6357b9b0..00000000 --- a/src/erlang-oauth/oauth.app +++ /dev/null @@ -1,20 +0,0 @@ -{application, oauth, [ - {description, "Erlang OAuth implementation"}, - {vsn, "dev"}, - {modules, [ - oauth, - oauth_hmac_sha1, - oauth_http, - oauth_plaintext, - oauth_rsa_sha1, - oauth_unix, - oauth_uri - ]}, - {registered, []}, - {applications, [ - kernel, - stdlib, - crypto, - inets - ]} -]}. diff --git a/src/erlang-oauth/oauth.app.in b/src/erlang-oauth/oauth.app.in new file mode 100644 index 00000000..6357b9b0 --- /dev/null +++ b/src/erlang-oauth/oauth.app.in @@ -0,0 +1,20 @@ +{application, oauth, [ + {description, "Erlang OAuth implementation"}, + {vsn, "dev"}, + {modules, [ + oauth, + oauth_hmac_sha1, + oauth_http, + oauth_plaintext, + oauth_rsa_sha1, + oauth_unix, + oauth_uri + ]}, + {registered, []}, + {applications, [ + kernel, + stdlib, + crypto, + inets + ]} +]}. diff --git a/src/ibrowse/Makefile.am b/src/ibrowse/Makefile.am index 76262a6e..510f36a9 100644 --- a/src/ibrowse/Makefile.am +++ b/src/ibrowse/Makefile.am @@ -13,6 +13,7 @@ ibrowseebindir = $(localerlanglibdir)/ibrowse-1.5.2/ebin ibrowse_file_collection = \ + ibrowse.app.in \ ibrowse.erl \ ibrowse_app.erl \ ibrowse_http_client.erl \ @@ -21,9 +22,8 @@ ibrowse_file_collection = \ ibrowse_sup.erl \ ibrowse_test.erl -ibrowseebin_static_file = ibrowse.app - ibrowseebin_make_generated_file_list = \ + ibrowse.app \ ibrowse.beam \ ibrowse_app.beam \ ibrowse_http_client.beam \ @@ -33,16 +33,17 @@ ibrowseebin_make_generated_file_list = \ ibrowse_test.beam ibrowseebin_DATA = \ - $(ibrowseebin_static_file) \ $(ibrowseebin_make_generated_file_list) EXTRA_DIST = \ $(ibrowse_file_collection) \ - $(ibrowseebin_static_file) \ ibrowse.hrl CLEANFILES = \ $(ibrowseebin_make_generated_file_list) +%.app: %.app.in + cp $< $@ + %.beam: %.erl $(ERLC) $(ERLC_FLAGS) $< diff --git a/src/ibrowse/ibrowse.app b/src/ibrowse/ibrowse.app deleted file mode 100644 index 4f43dd92..00000000 --- a/src/ibrowse/ibrowse.app +++ /dev/null @@ -1,13 +0,0 @@ -{application, ibrowse, - [{description, "HTTP client application"}, - {vsn, "1.5.1"}, - {modules, [ ibrowse, - ibrowse_http_client, - ibrowse_app, - ibrowse_sup, - ibrowse_lib, - ibrowse_lb ]}, - {registered, []}, - {applications, [kernel,stdlib,sasl]}, - {env, []}, - {mod, {ibrowse_app, []}}]}. diff --git a/src/ibrowse/ibrowse.app.in b/src/ibrowse/ibrowse.app.in new file mode 100644 index 00000000..4f43dd92 --- /dev/null +++ b/src/ibrowse/ibrowse.app.in @@ -0,0 +1,13 @@ +{application, ibrowse, + [{description, "HTTP client application"}, + {vsn, "1.5.1"}, + {modules, [ ibrowse, + ibrowse_http_client, + ibrowse_app, + ibrowse_sup, + ibrowse_lib, + ibrowse_lb ]}, + {registered, []}, + {applications, [kernel,stdlib,sasl]}, + {env, []}, + {mod, {ibrowse_app, []}}]}. diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am index db46ace3..608d4dcd 100644 --- a/src/mochiweb/Makefile.am +++ b/src/mochiweb/Makefile.am @@ -20,6 +20,7 @@ mochiweb_file_collection = \ mochijson.erl \ mochijson2.erl \ mochinum.erl \ + mochiweb.app.in \ mochiweb.erl \ mochiweb_app.erl \ mochiweb_charref.erl \ @@ -37,8 +38,6 @@ mochiweb_file_collection = \ mochiweb_util.erl \ reloader.erl -mochiwebebin_static_file = mochiweb.app - mochiwebebin_make_generated_file_list = \ mochifmt.beam \ mochifmt_records.beam \ @@ -47,6 +46,7 @@ mochiwebebin_make_generated_file_list = \ mochijson.beam \ mochijson2.beam \ mochinum.beam \ + mochiweb.app \ mochiweb.beam \ mochiweb_app.beam \ mochiweb_charref.beam \ @@ -65,15 +65,16 @@ mochiwebebin_make_generated_file_list = \ reloader.beam mochiwebebin_DATA = \ - $(mochiwebebin_static_file) \ $(mochiwebebin_make_generated_file_list) EXTRA_DIST = \ - $(mochiweb_file_collection) \ - $(mochiwebebin_static_file) + $(mochiweb_file_collection) CLEANFILES = \ $(mochiwebebin_make_generated_file_list) +%.app: %.app.in + cp $< $@ + %.beam: %.erl $(ERLC) $(ERLC_FLAGS) $< diff --git a/src/mochiweb/mochiweb.app b/src/mochiweb/mochiweb.app deleted file mode 100644 index cd8dbb25..00000000 --- a/src/mochiweb/mochiweb.app +++ /dev/null @@ -1,32 +0,0 @@ -{application, mochiweb, - [{description, "MochiMedia Web Server"}, - {vsn, "0.01"}, - {modules, [ - mochihex, - mochijson, - mochijson2, - mochinum, - mochiweb, - mochiweb_app, - mochiweb_charref, - mochiweb_cookies, - mochiweb_echo, - mochiweb_headers, - mochiweb_html, - mochiweb_http, - mochiweb_multipart, - mochiweb_request, - mochiweb_response, - mochiweb_skel, - mochiweb_socket_server, - mochiweb_sup, - mochiweb_util, - reloader, - mochifmt, - mochifmt_std, - mochifmt_records - ]}, - {registered, []}, - {mod, {mochiweb_app, []}}, - {env, []}, - {applications, [kernel, stdlib]}]}. diff --git a/src/mochiweb/mochiweb.app.in b/src/mochiweb/mochiweb.app.in new file mode 100644 index 00000000..cd8dbb25 --- /dev/null +++ b/src/mochiweb/mochiweb.app.in @@ -0,0 +1,32 @@ +{application, mochiweb, + [{description, "MochiMedia Web Server"}, + {vsn, "0.01"}, + {modules, [ + mochihex, + mochijson, + mochijson2, + mochinum, + mochiweb, + mochiweb_app, + mochiweb_charref, + mochiweb_cookies, + mochiweb_echo, + mochiweb_headers, + mochiweb_html, + mochiweb_http, + mochiweb_multipart, + mochiweb_request, + mochiweb_response, + mochiweb_skel, + mochiweb_socket_server, + mochiweb_sup, + mochiweb_util, + reloader, + mochifmt, + mochifmt_std, + mochifmt_records + ]}, + {registered, []}, + {mod, {mochiweb_app, []}}, + {env, []}, + {applications, [kernel, stdlib]}]}. -- cgit v1.2.3