diff options
| author | Loïc Hoguin <[email protected]> | 2016-11-15 12:52:07 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2016-11-15 12:52:07 +0200 |
| commit | 5c6cedf9926c3106f558113524f91a8539eef337 (patch) | |
| tree | bfe39188ffbceaff1c5e6b6c14941780189e74d9 | |
| parent | 9e5cce8cbdb8c083cbde848010b4a89a9fd1a233 (diff) | |
| download | ranch-5c6cedf9926c3106f558113524f91a8539eef337.tar.gz ranch-5c6cedf9926c3106f558113524f91a8539eef337.tar.bz2 ranch-5c6cedf9926c3106f558113524f91a8539eef337.zip | |
Add ssl to the list of dependencies
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | ebin/ranch.app | 9 | ||||
| -rw-r--r-- | src/ranch.app.src | 27 | ||||
| -rw-r--r-- | test/ranch_ct_hook.erl | 2 |
4 files changed, 15 insertions, 28 deletions
@@ -1,6 +1,9 @@ # See LICENSE for licensing information. PROJECT = ranch +PROJECT_DESCRIPTION = Socket acceptor pool for TCP protocols. +PROJECT_VERSION = 1.3.0 +PROJECT_REGISTERED = ranch_server # Options. @@ -18,6 +21,8 @@ CI_ERLLVM ?= $(CI_HIPE) # Dependencies. +LOCAL_DEPS = ssl + TEST_DEPS = ct_helper dep_ct_helper = git https://github.com/ninenines/ct_helper master diff --git a/ebin/ranch.app b/ebin/ranch.app new file mode 100644 index 0000000..15e74a5 --- /dev/null +++ b/ebin/ranch.app @@ -0,0 +1,9 @@ +{application, ranch, [ + {description, "Socket acceptor pool for TCP protocols."}, + {vsn, "1.3.0"}, + {modules, ['ranch','ranch_acceptor','ranch_acceptors_sup','ranch_app','ranch_conns_sup','ranch_listener_sup','ranch_protocol','ranch_server','ranch_ssl','ranch_sup','ranch_tcp','ranch_transport']}, + {registered, [ranch_sup,ranch_server]}, + {applications, [kernel,stdlib,ssl]}, + {mod, {ranch_app, []}}, + {env, []} +]}.
\ No newline at end of file diff --git a/src/ranch.app.src b/src/ranch.app.src deleted file mode 100644 index af43f1c..0000000 --- a/src/ranch.app.src +++ /dev/null @@ -1,27 +0,0 @@ -%% Copyright (c) 2011-2015, Loïc Hoguin <[email protected]> -%% -%% Permission to use, copy, modify, and/or distribute this software for any -%% purpose with or without fee is hereby granted, provided that the above -%% copyright notice and this permission notice appear in all copies. -%% -%% THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -%% WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -%% MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -%% ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -%% WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -{application, ranch, [ - {description, "Socket acceptor pool for TCP protocols."}, - {vsn, "1.2.1"}, - {id, "git"}, - {modules, []}, - {registered, [ranch_sup, ranch_server]}, - {applications, [ - kernel, - stdlib - ]}, - {mod, {ranch_app, []}}, - {env, []} -]}. diff --git a/test/ranch_ct_hook.erl b/test/ranch_ct_hook.erl index 051e5b2..c26850e 100644 --- a/test/ranch_ct_hook.erl +++ b/test/ranch_ct_hook.erl @@ -17,7 +17,7 @@ -export([init/2]). init(_, _) -> - ct_helper:start([ranch, ssl]), + ct_helper:start([ranch]), ct_helper:make_certs_in_ets(), error_logger:add_report_handler(ct_helper_error_h), {ok, undefined}. |