aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile11
-rwxr-xr-xall.sh4
-rw-r--r--erlang.mk733
-rw-r--r--examples/chunked_hello_world/Makefile3
-rw-r--r--examples/compress_response/Makefile3
-rw-r--r--examples/cookie/Makefile4
-rw-r--r--examples/echo_get/Makefile3
-rw-r--r--examples/echo_post/Makefile3
-rw-r--r--examples/error_hook/Makefile3
-rw-r--r--examples/eventsource/Makefile3
-rw-r--r--examples/hello_world/Makefile3
-rw-r--r--examples/markdown_middleware/Makefile3
-rw-r--r--examples/rest_basic_auth/Makefile3
-rw-r--r--examples/rest_hello_world/Makefile3
-rw-r--r--examples/rest_pastebin/Makefile3
-rw-r--r--examples/rest_stream_response/Makefile3
-rw-r--r--examples/ssl_hello_world/Makefile3
-rw-r--r--examples/static_world/Makefile3
-rw-r--r--examples/upload/Makefile3
-rw-r--r--examples/web_server/Makefile3
-rw-r--r--examples/websocket/Makefile3
21 files changed, 578 insertions, 225 deletions
diff --git a/Makefile b/Makefile
index 70eec4f..b68fb49 100644
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,14 @@ PROJECT = cowboy
ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \
+warn_shadow_vars +warn_obsolete_guard +warn_missing_spec
COMPILE_FIRST = cowboy_middleware cowboy_sub_protocol
-CT_SUITES = eunit http loop_handler spdy ws
CT_OPTS += -pa test -ct_hooks cowboy_ct_hook []
PLT_APPS = crypto public_key ssl
# Dependencies.
DEPS = cowlib ranch
-dep_cowlib = pkg://cowlib 0.6.2
-dep_ranch = pkg://ranch 0.10.0
-
TEST_DEPS = ct_helper gun
-dep_ct_helper = https://github.com/extend/ct_helper.git master
-dep_gun = pkg://gun master
+dep_ct_helper = git https://github.com/extend/ct_helper.git master
# Standard targets.
@@ -27,7 +22,7 @@ include erlang.mk
# Documentation.
-dep_ezdoc = https://github.com/ninenines/ezdoc master
+dep_ezdoc = git https://github.com/ninenines/ezdoc master
$(eval $(call dep_target,ezdoc))
build-doc-deps: $(DEPS_DIR)/ezdoc
@@ -61,7 +56,7 @@ init:stop().
endef
export ezdoc_script
-docs: clean-docs build-doc-deps
+docs:: clean-docs build-doc-deps
@mkdir -p doc/man3 doc/man7 doc/markdown/guide doc/markdown/manual
$(gen_verbose) erl -noinput -pa ebin deps/ezdoc/ebin -eval "$$ezdoc_script"
@gzip doc/man3/*.3 doc/man7/*.7
diff --git a/all.sh b/all.sh
index 9dad903..32b8302 100755
--- a/all.sh
+++ b/all.sh
@@ -1,9 +1,9 @@
#!/bin/sh
KERL_INSTALL_PATH=~/erlang
-KERL_RELEASES="r16b r16b01 r16b02 r16b03-1 17.0 17.1.2"
+KERL_RELEASES="r16b01 r16b02 r16b03-1 17.0 17.1.2"
-make build-tests
+make build-ct-suites
for rel in $KERL_RELEASES
do
diff --git a/erlang.mk b/erlang.mk
index 8c62069..e846738 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -12,109 +12,195 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# Project.
+.PHONY: all deps app rel docs tests clean distclean help
+
+ERLANG_MK_VERSION = 1
+
+# Core configuration.
PROJECT ?= $(notdir $(CURDIR))
+PROJECT := $(strip $(PROJECT))
-# Packages database file.
+# Verbosity.
-PKG_FILE ?= $(CURDIR)/.erlang.mk.packages.v1
-export PKG_FILE
+V ?= 0
-PKG_FILE_URL ?= https://raw.githubusercontent.com/extend/erlang.mk/master/packages.v1.tsv
+gen_verbose_0 = @echo " GEN " $@;
+gen_verbose = $(gen_verbose_$(V))
-define get_pkg_file
- wget --no-check-certificate -O $(PKG_FILE) $(PKG_FILE_URL) || rm $(PKG_FILE)
+# Core targets.
+
+all:: deps app rel
+
+clean::
+ $(gen_verbose) rm -f erl_crash.dump
+
+distclean:: clean
+
+help::
+ @printf "%s\n" \
+ "erlang.mk (version $(ERLANG_MK_VERSION)) is distributed under the terms of the ISC License." \
+ "Copyright (c) 2013-2014 Loïc Hoguin <[email protected]>" \
+ "" \
+ "Usage: [V=1] make [target]" \
+ "" \
+ "Core targets:" \
+ " all Run deps, app and rel targets in that order" \
+ " deps Fetch dependencies (if needed) and compile them" \
+ " app Compile the project" \
+ " rel Build a release for this project, if applicable" \
+ " docs Build the documentation for this project" \
+ " tests Run the tests for this project" \
+ " clean Delete temporary and output files from most targets" \
+ " distclean Delete all temporary and output files" \
+ " help Display this help and exit" \
+ "" \
+ "The target clean only removes files that are commonly removed." \
+ "Dependencies and releases are left untouched." \
+ "" \
+ "Setting V=1 when calling make enables verbose mode."
+
+# Core functions.
+
+define core_http_get
+ wget --no-check-certificate -O $(1) $(2)|| rm $(1)
endef
-# Verbosity and tweaks.
+# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
-V ?= 0
+.PHONY: distclean-deps distclean-pkg pkg-list pkg-search
-appsrc_verbose_0 = @echo " APP " $(PROJECT).app.src;
-appsrc_verbose = $(appsrc_verbose_$(V))
+# Configuration.
-erlc_verbose_0 = @echo " ERLC " $(filter %.erl %.core,$(?F));
-erlc_verbose = $(erlc_verbose_$(V))
+DEPS_DIR ?= $(CURDIR)/deps
+export DEPS_DIR
-xyrl_verbose_0 = @echo " XYRL " $(filter %.xrl %.yrl,$(?F));
-xyrl_verbose = $(xyrl_verbose_$(V))
+REBAR_DEPS_DIR = $(DEPS_DIR)
+export REBAR_DEPS_DIR
-dtl_verbose_0 = @echo " DTL " $(filter %.dtl,$(?F));
-dtl_verbose = $(dtl_verbose_$(V))
+ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(DEPS))
-gen_verbose_0 = @echo " GEN " $@;
-gen_verbose = $(gen_verbose_$(V))
+ifeq ($(filter $(DEPS_DIR),$(subst :, ,$(ERL_LIBS))),)
+ifeq ($(ERL_LIBS),)
+ ERL_LIBS = $(DEPS_DIR)
+else
+ ERL_LIBS := $(ERL_LIBS):$(DEPS_DIR)
+endif
+endif
+export ERL_LIBS
-.PHONY: rel clean-rel all clean-all app clean deps clean-deps \
- docs clean-docs build-tests tests build-plt dialyze
+PKG_FILE2 ?= $(CURDIR)/.erlang.mk.packages.v2
+export PKG_FILE2
-# Release.
+PKG_FILE_URL ?= https://raw.githubusercontent.com/extend/erlang.mk/master/packages.v2.tsv
-RELX_CONFIG ?= $(CURDIR)/relx.config
+# Core targets.
-ifneq ($(wildcard $(RELX_CONFIG)),)
+deps:: $(ALL_DEPS_DIRS)
+ @for dep in $(ALL_DEPS_DIRS) ; do \
+ if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \
+ $(MAKE) -C $$dep ; \
+ else \
+ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \
+ fi ; \
+ done
-RELX ?= $(CURDIR)/relx
-export RELX
+distclean:: distclean-deps distclean-pkg
-RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx
-RELX_OPTS ?=
-RELX_OUTPUT_DIR ?= _rel
+# Deps related targets.
-ifneq ($(firstword $(subst -o,,$(RELX_OPTS))),)
- RELX_OUTPUT_DIR = $(firstword $(subst -o,,$(RELX_OPTS)))
-endif
+define dep_fetch
+ if [ "$$$$VS" = "git" ]; then \
+ git clone -n -- $$$$REPO $(DEPS_DIR)/$(1); \
+ cd $(DEPS_DIR)/$(1) && git checkout -q $$$$COMMIT; \
+ else \
+ exit 78; \
+ fi
+endef
-define get_relx
- wget -O $(RELX) $(RELX_URL) || rm $(RELX)
- chmod +x $(RELX)
+define dep_target
+$(DEPS_DIR)/$(1):
+ @mkdir -p $(DEPS_DIR)
+ @if [ ! -f $(PKG_FILE2) ]; then $(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL)); fi
+ifeq (,$(dep_$(1)))
+ DEPPKG=$$$$(awk 'BEGIN { FS = "\t" }; $$$$1 == "$(1)" { print $$$$2 " " $$$$3 " " $$$$4 }' $(PKG_FILE2);) \
+ VS=$$$$(echo $$$$DEPPKG | cut -d " " -f1); \
+ REPO=$$$$(echo $$$$DEPPKG | cut -d " " -f2); \
+ COMMIT=$$$$(echo $$$$DEPPKG | cut -d " " -f3); \
+ $(call dep_fetch,$(1))
+else
+ VS=$(word 1,$(dep_$(1))); \
+ REPO=$(word 2,$(dep_$(1))); \
+ COMMIT=$(word 3,$(dep_$(1))); \
+ $(call dep_fetch,$(1))
+endif
endef
-rel: clean-rel all $(RELX)
- @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS)
+$(foreach dep,$(DEPS),$(eval $(call dep_target,$(dep))))
-$(RELX):
- @$(call get_relx)
+distclean-deps:
+ $(gen_verbose) rm -rf $(DEPS_DIR)
-clean-rel:
- $(gen_verbose) rm -rf $(RELX_OUTPUT_DIR)
+# Packages related targets.
-endif
+$(PKG_FILE2):
+ $(call core_http_get,$(PKG_FILE2),$(PKG_FILE_URL))
-# Deps directory.
+pkg-list: $(PKG_FILE2)
+ @cat $(PKG_FILE2) | awk 'BEGIN { FS = "\t" }; { print \
+ "Name:\t\t" $$1 "\n" \
+ "Repository:\t" $$3 "\n" \
+ "Website:\t" $$5 "\n" \
+ "Description:\t" $$6 "\n" }'
-DEPS_DIR ?= $(CURDIR)/deps
-export DEPS_DIR
+ifdef q
+pkg-search: $(PKG_FILE2)
+ @cat $(PKG_FILE2) | grep -i ${q} | awk 'BEGIN { FS = "\t" }; { print \
+ "Name:\t\t" $$1 "\n" \
+ "Repository:\t" $$3 "\n" \
+ "Website:\t" $$5 "\n" \
+ "Description:\t" $$6 "\n" }'
+else
+pkg-search:
+ $(error Usage: make pkg-search q=STRING)
+endif
-REBAR_DEPS_DIR = $(DEPS_DIR)
-export REBAR_DEPS_DIR
+distclean-pkg:
+ $(gen_verbose) rm -f $(PKG_FILE2)
-ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(DEPS))
-ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
+help::
+ @printf "%s\n" "" \
+ "Package-related targets:" \
+ " pkg-list List all known packages" \
+ " pkg-search q=STRING Search for STRING in the package index"
-# Application.
+# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
-ifeq ($(filter $(DEPS_DIR),$(subst :, ,$(ERL_LIBS))),)
-ifeq ($(ERL_LIBS),)
- ERL_LIBS = $(DEPS_DIR)
-else
- ERL_LIBS := $(ERL_LIBS):$(DEPS_DIR)
-endif
-endif
-export ERL_LIBS
+.PHONY: clean-app
+
+# Configuration.
ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \
+warn_shadow_vars +warn_obsolete_guard # +bin_opt_info +warn_missing_spec
COMPILE_FIRST ?=
COMPILE_FIRST_PATHS = $(addprefix src/,$(addsuffix .erl,$(COMPILE_FIRST)))
-all: deps app
+# Verbosity.
+
+appsrc_verbose_0 = @echo " APP " $(PROJECT).app.src;
+appsrc_verbose = $(appsrc_verbose_$(V))
-clean-all: clean clean-deps clean-docs
- $(gen_verbose) rm -rf .$(PROJECT).plt $(DEPS_DIR) logs
+erlc_verbose_0 = @echo " ERLC " $(filter %.erl %.core,$(?F));
+erlc_verbose = $(erlc_verbose_$(V))
+
+xyrl_verbose_0 = @echo " XYRL " $(filter %.xrl %.yrl,$(?F));
+xyrl_verbose = $(xyrl_verbose_$(V))
-app: ebin/$(PROJECT).app
+# Core targets.
+
+app:: ebin/$(PROJECT).app
$(eval MODULES := $(shell find ebin -type f -name \*.beam \
| sed "s/ebin\//'/;s/\.beam/',/" | sed '$$s/.$$//'))
$(appsrc_verbose) cat src/$(PROJECT).app.src \
@@ -132,88 +218,336 @@ define compile_xyrl
@rm ebin/*.erl
endef
-define compile_dtl
- $(dtl_verbose) erl -noshell -pa ebin/ $(DEPS_DIR)/erlydtl/ebin/ -eval ' \
- Compile = fun(F) -> \
- Module = list_to_atom( \
- string:to_lower(filename:basename(F, ".dtl")) ++ "_dtl"), \
- erlydtl:compile(F, Module, [{out_dir, "ebin/"}]) \
- end, \
- _ = [Compile(F) || F <- string:tokens("$(1)", " ")], \
- init:stop()'
-endef
-
-ebin/$(PROJECT).app: $(shell find src -type f -name \*.erl) \
- $(shell find src -type f -name \*.core) \
- $(shell find src -type f -name \*.xrl) \
- $(shell find src -type f -name \*.yrl) \
- $(shell find templates -type f -name \*.dtl 2>/dev/null)
+ifneq ($(wildcard src/),)
+ebin/$(PROJECT).app::
@mkdir -p ebin/
- $(if $(strip $(filter %.erl %.core,$?)), \
- $(call compile_erl,$(filter %.erl %.core,$?)))
- $(if $(strip $(filter %.xrl %.yrl,$?)), \
- $(call compile_xyrl,$(filter %.xrl %.yrl,$?)))
- $(if $(strip $(filter %.dtl,$?)), \
- $(call compile_dtl,$(filter %.dtl,$?)))
-clean:
- $(gen_verbose) rm -rf ebin/ test/*.beam erl_crash.dump
+ebin/$(PROJECT).app:: $(shell find src -type f -name \*.erl) \
+ $(shell find src -type f -name \*.core)
+ $(if $(strip $?),$(call compile_erl,$?))
-# Dependencies.
+ebin/$(PROJECT).app:: $(shell find src -type f -name \*.xrl) \
+ $(shell find src -type f -name \*.yrl)
+ $(if $(strip $?),$(call compile_xyrl,$?))
+endif
-define get_dep
- @mkdir -p $(DEPS_DIR)
-ifeq (,$(findstring pkg://,$(word 1,$(dep_$(1)))))
- git clone -n -- $(word 1,$(dep_$(1))) $(DEPS_DIR)/$(1)
-else
- @if [ ! -f $(PKG_FILE) ]; then $(call get_pkg_file); fi
- git clone -n -- `awk 'BEGIN { FS = "\t" }; \
- $$$$1 == "$(subst pkg://,,$(word 1,$(dep_$(1))))" { print $$$$2 }' \
- $(PKG_FILE)` $(DEPS_DIR)/$(1)
+clean:: clean-app
+
+# Extra targets.
+
+clean-app:
+ $(gen_verbose) rm -rf ebin/
+
+# Copyright (c) 2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
+
+.PHONY: bootstrap bootstrap-lib bootstrap-rel new list-templates
+
+# Core targets.
+
+help::
+ @printf "%s\n" "" \
+ "Bootstrap targets:" \
+ " bootstrap Generate a skeleton of an OTP application" \
+ " bootstrap-lib Generate a skeleton of an OTP library" \
+ " bootstrap-rel Generate the files needed to build a release" \
+ " new t=TPL n=NAME Generate a module NAME based on the template TPL" \
+ " bootstrap-lib List available templates"
+
+# Bootstrap templates.
+
+bs_appsrc = "{application, $(PROJECT), [" \
+ " {description, \"\"}," \
+ " {vsn, \"0.1.0\"}," \
+ " {modules, []}," \
+ " {registered, []}," \
+ " {applications, [" \
+ " kernel," \
+ " stdlib" \
+ " ]}," \
+ " {mod, {$(PROJECT)_app, []}}," \
+ " {env, []}" \
+ "]}."
+bs_appsrc_lib = "{application, $(PROJECT), [" \
+ " {description, \"\"}," \
+ " {vsn, \"0.1.0\"}," \
+ " {modules, []}," \
+ " {registered, []}," \
+ " {applications, [" \
+ " kernel," \
+ " stdlib" \
+ " ]}" \
+ "]}."
+bs_Makefile = "PROJECT = $(PROJECT)" \
+ "include erlang.mk"
+bs_app = "-module($(PROJECT)_app)." \
+ "-behaviour(application)." \
+ "" \
+ "-export([start/2])." \
+ "-export([stop/1])." \
+ "" \
+ "start(_Type, _Args) ->" \
+ " $(PROJECT)_sup:start_link()." \
+ "" \
+ "stop(_State) ->" \
+ " ok."
+bs_relx_config = "{release, {$(PROJECT)_release, \"1\"}, [$(PROJECT)]}." \
+ "{extended_start_script, true}." \
+ "{sys_config, \"rel/sys.config\"}." \
+ "{vm_args, \"rel/vm.args\"}."
+bs_sys_config = "[" \
+ "]."
+bs_vm_args = "-name $(PROJECT)@127.0.0.1" \
+ "-setcookie $(PROJECT)" \
+ "-heart"
+# Normal templates.
+tpl_supervisor = "-module($(n))." \
+ "-behaviour(supervisor)." \
+ "" \
+ "-export([start_link/0])." \
+ "-export([init/1])." \
+ "" \
+ "start_link() ->" \
+ " supervisor:start_link({local, ?MODULE}, ?MODULE, [])." \
+ "" \
+ "init([]) ->" \
+ " Procs = []," \
+ " {ok, {{one_for_one, 1, 5}, Procs}}."
+tpl_gen_server = "-module($(n))." \
+ "-behaviour(gen_server)." \
+ "" \
+ "%% API." \
+ "-export([start_link/0])." \
+ "" \
+ "%% gen_server." \
+ "-export([init/1])." \
+ "-export([handle_call/3])." \
+ "-export([handle_cast/2])." \
+ "-export([handle_info/2])." \
+ "-export([terminate/2])." \
+ "-export([code_change/3])." \
+ "" \
+ "-record(state, {" \
+ "})." \
+ "" \
+ "%% API." \
+ "" \
+ "-spec start_link() -> {ok, pid()}." \
+ "start_link() ->" \
+ " gen_server:start_link(?MODULE, [], [])." \
+ "" \
+ "%% gen_server." \
+ "" \
+ "init([]) ->" \
+ " {ok, \#state{}}." \
+ "" \
+ "handle_call(_Request, _From, State) ->" \
+ " {reply, ignored, State}." \
+ "" \
+ "handle_cast(_Msg, State) ->" \
+ " {noreply, State}." \
+ "" \
+ "handle_info(_Info, State) ->" \
+ " {noreply, State}." \
+ "" \
+ "terminate(_Reason, _State) ->" \
+ " ok." \
+ "" \
+ "code_change(_OldVsn, State, _Extra) ->" \
+ " {ok, State}."
+tpl_cowboy_http = "-module($(n))." \
+ "-behaviour(cowboy_http_handler)." \
+ "" \
+ "-export([init/3])." \
+ "-export([handle/2])." \
+ "-export([terminate/3])." \
+ "" \
+ "-record(state, {" \
+ "})." \
+ "" \
+ "init(_, Req, _Opts) ->" \
+ " {ok, Req, \#state{}}." \
+ "" \
+ "handle(Req, State=\#state{}) ->" \
+ " {ok, Req2} = cowboy_req:reply(200, Req)," \
+ " {ok, Req2, State}." \
+ "" \
+ "terminate(_Reason, _Req, _State) ->" \
+ " ok."
+tpl_cowboy_loop = "-module($(n))." \
+ "-behaviour(cowboy_loop_handler)." \
+ "" \
+ "-export([init/3])." \
+ "-export([info/3])." \
+ "-export([terminate/3])." \
+ "" \
+ "-record(state, {" \
+ "})." \
+ "" \
+ "init(_, Req, _Opts) ->" \
+ " {loop, Req, \#state{}, 5000, hibernate}." \
+ "" \
+ "info(_Info, Req, State) ->" \
+ " {loop, Req, State, hibernate}." \
+ "" \
+ "terminate(_Reason, _Req, _State) ->" \
+ " ok."
+tpl_cowboy_rest = "-module($(n))." \
+ "" \
+ "-export([init/3])." \
+ "-export([content_types_provided/2])." \
+ "-export([get_html/2])." \
+ "" \
+ "init(_, _Req, _Opts) ->" \
+ " {upgrade, protocol, cowboy_rest}." \
+ "" \
+ "content_types_provided(Req, State) ->" \
+ " {[{{<<\"text\">>, <<\"html\">>, '_'}, get_html}], Req, State}." \
+ "" \
+ "get_html(Req, State) ->" \
+ " {<<\"<html><body>This is REST!</body></html>\">>, Req, State}."
+tpl_cowboy_ws = "-module($(n))." \
+ "-behaviour(cowboy_websocket_handler)." \
+ "" \
+ "-export([init/3])." \
+ "-export([websocket_init/3])." \
+ "-export([websocket_handle/3])." \
+ "-export([websocket_info/3])." \
+ "-export([websocket_terminate/3])." \
+ "" \
+ "-record(state, {" \
+ "})." \
+ "" \
+ "init(_, _, _) ->" \
+ " {upgrade, protocol, cowboy_websocket}." \
+ "" \
+ "websocket_init(_, Req, _Opts) ->" \
+ " Req2 = cowboy_req:compact(Req)," \
+ " {ok, Req2, \#state{}}." \
+ "" \
+ "websocket_handle({text, Data}, Req, State) ->" \
+ " {reply, {text, Data}, Req, State};" \
+ "websocket_handle({binary, Data}, Req, State) ->" \
+ " {reply, {binary, Data}, Req, State};" \
+ "websocket_handle(_Frame, Req, State) ->" \
+ " {ok, Req, State}." \
+ "" \
+ "websocket_info(_Info, Req, State) ->" \
+ " {ok, Req, State}." \
+ "" \
+ "websocket_terminate(_Reason, _Req, _State) ->" \
+ " ok."
+tpl_ranch_protocol = "-module($(n))." \
+ "-behaviour(ranch_protocol)." \
+ "" \
+ "-export([start_link/4])." \
+ "-export([init/4])." \
+ "" \
+ "-type opts() :: []." \
+ "-export_type([opts/0])." \
+ "" \
+ "-record(state, {" \
+ " socket :: inet:socket()," \
+ " transport :: module()" \
+ "})." \
+ "" \
+ "start_link(Ref, Socket, Transport, Opts) ->" \
+ " Pid = spawn_link(?MODULE, init, [Ref, Socket, Transport, Opts])," \
+ " {ok, Pid}." \
+ "" \
+ "-spec init(ranch:ref(), inet:socket(), module(), opts()) -> ok." \
+ "init(Ref, Socket, Transport, _Opts) ->" \
+ " ok = ranch:accept_ack(Ref)," \
+ " loop(\#state{socket=Socket, transport=Transport})." \
+ "" \
+ "loop(State) ->" \
+ " loop(State)."
+
+# Plugin-specific targets.
+
+bootstrap:
+ifneq ($(wildcard src/),)
+ $(error Error: src/ directory already exists)
endif
- cd $(DEPS_DIR)/$(1) ; git checkout -q $(word 2,$(dep_$(1)))
-endef
+ @printf "%s\n" $(bs_Makefile) > Makefile
+ @mkdir src/
+ @printf "%s\n" $(bs_appsrc) > src/$(PROJECT).app.src
+ @printf "%s\n" $(bs_app) > src/$(PROJECT)_app.erl
+ $(eval n := $(PROJECT)_sup)
+ @printf "%s\n" $(tpl_supervisor) > src/$(PROJECT)_sup.erl
+
+bootstrap-lib:
+ifneq ($(wildcard src/),)
+ $(error Error: src/ directory already exists)
+endif
+ @printf "%s\n" $(bs_Makefile) > Makefile
+ @mkdir src/
+ @printf "%s\n" $(bs_appsrc_lib) > src/$(PROJECT).app.src
-define dep_target
-$(DEPS_DIR)/$(1):
- $(call get_dep,$(1))
-endef
+bootstrap-rel:
+ifneq ($(wildcard relx.config),)
+ $(error Error: relx.config already exists)
+endif
+ifneq ($(wildcard rel/),)
+ $(error Error: rel/ directory already exists)
+endif
+ @printf "%s\n" $(bs_relx_config) > relx.config
+ @mkdir rel/
+ @printf "%s\n" $(bs_sys_config) > rel/sys.config
+ @printf "%s\n" $(bs_vm_args) > rel/vm.args
+
+new:
+ifeq ($(wildcard src/),)
+ $(error Error: src/ directory does not exist)
+endif
+ifndef t
+ $(error Usage: make new t=TEMPLATE n=NAME)
+endif
+ifndef tpl_$(t)
+ $(error Unknown template)
+endif
+ifndef n
+ $(error Usage: make new t=TEMPLATE n=NAME)
+endif
+ @printf "%s\n" $(tpl_$(t)) > src/$(n).erl
-$(foreach dep,$(DEPS),$(eval $(call dep_target,$(dep))))
+list-templates:
+ @echo Available templates: $(sort $(patsubst tpl_%,%,$(filter tpl_%,$(.VARIABLES))))
-deps: $(ALL_DEPS_DIRS)
- @for dep in $(ALL_DEPS_DIRS) ; do \
- if [ -f $$dep/Makefile ] ; then \
- $(MAKE) -C $$dep ; \
- else \
- echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \
- fi ; \
- done
+# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
-clean-deps:
- @for dep in $(ALL_DEPS_DIRS) ; do \
- if [ -f $$dep/Makefile ] ; then \
- $(MAKE) -C $$dep clean ; \
- else \
- echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep clean ; \
- fi ; \
- done
+.PHONY: build-ct-deps build-ct-suites tests-ct clean-ct distclean-ct
-# Tests.
+# Configuration.
-$(foreach dep,$(TEST_DEPS),$(eval $(call dep_target,$(dep))))
+CT_OPTS ?=
+ifneq ($(wildcard test/),)
+ CT_SUITES ?= $(sort $(subst _SUITE.erl,,$(shell find test -type f -name \*_SUITE.erl -exec basename {} \;)))
+else
+ CT_SUITES ?=
+endif
TEST_ERLC_OPTS ?= +debug_info +warn_export_vars +warn_shadow_vars +warn_obsolete_guard
TEST_ERLC_OPTS += -DTEST=1 -DEXTRA=1 +'{parse_transform, eunit_autoexport}'
-build-test-deps: $(ALL_TEST_DEPS_DIRS)
- @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done
+# Core targets.
-build-tests: build-test-deps
- $(gen_verbose) erlc -v $(TEST_ERLC_OPTS) -o test/ \
- $(wildcard test/*.erl test/*/*.erl) -pa ebin/
+tests:: tests-ct
+
+clean:: clean-ct
+
+distclean:: distclean-ct
+
+help::
+ @printf "%s\n" "" \
+ "All your common_test suites have their associated targets." \
+ "A suite named http_SUITE can be ran using the ct-http target."
+
+# Plugin-specific targets.
+
+ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
-CT_OPTS ?=
CT_RUN = ct_run \
-no_auto_compile \
-noshell \
@@ -221,31 +555,49 @@ CT_RUN = ct_run \
-dir test \
-logdir logs
-CT_SUITES ?=
+$(foreach dep,$(TEST_DEPS),$(eval $(call dep_target,$(dep))))
-define test_target
-test_$(1): ERLC_OPTS = $(TEST_ERLC_OPTS)
-test_$(1): clean deps app build-tests
+build-ct-deps: $(ALL_TEST_DEPS_DIRS)
+ @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done
+
+build-ct-suites: build-ct-deps
+ $(gen_verbose) erlc -v $(TEST_ERLC_OPTS) -o test/ \
+ $(wildcard test/*.erl test/*/*.erl) -pa ebin/
+
+tests-ct: ERLC_OPTS = $(TEST_ERLC_OPTS)
+tests-ct: clean deps app build-ct-suites
@if [ -d "test" ] ; \
then \
mkdir -p logs/ ; \
- $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS) ; \
+ $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) ; \
fi
$(gen_verbose) rm -f test/*.beam
-endef
-
-$(foreach test,$(CT_SUITES),$(eval $(call test_target,$(test))))
-tests: ERLC_OPTS = $(TEST_ERLC_OPTS)
-tests: clean deps app build-tests
+define ct_suite_target
+ct-$(1): ERLC_OPTS = $(TEST_ERLC_OPTS)
+ct-$(1): clean deps app build-ct-suites
@if [ -d "test" ] ; \
then \
mkdir -p logs/ ; \
- $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) ; \
+ $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS) ; \
fi
$(gen_verbose) rm -f test/*.beam
+endef
+
+$(foreach test,$(CT_SUITES),$(eval $(call ct_suite_target,$(test))))
+
+clean-ct:
+ $(gen_verbose) rm -rf test/*.beam
-# Dialyzer.
+distclean-ct:
+ $(gen_verbose) rm -rf logs/
+
+# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
+
+.PHONY: plt distclean-plt dialyze
+
+# Configuration.
DIALYZER_PLT ?= $(CURDIR)/.$(PROJECT).plt
export DIALYZER_PLT
@@ -254,32 +606,93 @@ PLT_APPS ?=
DIALYZER_OPTS ?= -Werror_handling -Wrace_conditions \
-Wunmatched_returns # -Wunderspecs
-build-plt: deps app
+# Core targets.
+
+distclean:: distclean-plt
+
+help::
+ @printf "%s\n" "" \
+ "Dialyzer targets:" \
+ " plt Build a PLT file for this project" \
+ " dialyze Analyze the project using Dialyzer"
+
+# Plugin-specific targets.
+
+plt: deps app
@dialyzer --build_plt --apps erts kernel stdlib $(PLT_APPS) $(ALL_DEPS_DIRS)
+distclean-plt:
+ $(gen_verbose) rm -f $(DIALYZER_PLT)
+
dialyze:
- @dialyzer --src src --no_native $(DIALYZER_OPTS)
+ @dialyzer --no_native --src -r src $(DIALYZER_OPTS)
-# Packages.
+# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
-$(PKG_FILE):
- @$(call get_pkg_file)
+# Verbosity.
-pkg-list: $(PKG_FILE)
- @cat $(PKG_FILE) | awk 'BEGIN { FS = "\t" }; { print \
- "Name:\t\t" $$1 "\n" \
- "Repository:\t" $$2 "\n" \
- "Website:\t" $$3 "\n" \
- "Description:\t" $$4 "\n" }'
+dtl_verbose_0 = @echo " DTL " $(filter %.dtl,$(?F));
+dtl_verbose = $(dtl_verbose_$(V))
+
+# Core targets.
+
+define compile_erlydtl
+ $(dtl_verbose) erl -noshell -pa ebin/ $(DEPS_DIR)/erlydtl/ebin/ -eval ' \
+ Compile = fun(F) -> \
+ Module = list_to_atom( \
+ string:to_lower(filename:basename(F, ".dtl")) ++ "_dtl"), \
+ erlydtl:compile(F, Module, [{out_dir, "ebin/"}]) \
+ end, \
+ _ = [Compile(F) || F <- string:tokens("$(1)", " ")], \
+ init:stop()'
+endef
+
+ifneq ($(wildcard src/),)
+ebin/$(PROJECT).app:: $(shell find templates -type f -name \*.dtl 2>/dev/null)
+ $(if $(strip $?),$(call compile_erlydtl,$?))
+endif
+
+# Copyright (c) 2013-2014, Loïc Hoguin <[email protected]>
+# This file is part of erlang.mk and subject to the terms of the ISC License.
+
+.PHONY: distclean-rel
+
+# Configuration.
+
+RELX_CONFIG ?= $(CURDIR)/relx.config
+
+ifneq ($(wildcard $(RELX_CONFIG)),)
+
+RELX ?= $(CURDIR)/relx
+export RELX
+
+RELX_URL ?= https://github.com/erlware/relx/releases/download/v1.0.2/relx
+RELX_OPTS ?=
+RELX_OUTPUT_DIR ?= _rel
+
+ifeq ($(firstword $(RELX_OPTS)),-o)
+ RELX_OUTPUT_DIR = $(word 2,$(RELX_OPTS))
+endif
+
+# Core targets.
+
+rel:: distclean-rel $(RELX)
+ @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS)
+
+distclean:: distclean-rel
+
+# Plugin-specific targets.
+
+define relx_fetch
+ $(call core_http_get,$(RELX),$(RELX_URL))
+ chmod +x $(RELX)
+endef
+
+$(RELX):
+ @$(call relx_fetch)
+
+distclean-rel:
+ $(gen_verbose) rm -rf $(RELX) $(RELX_OUTPUT_DIR)
-ifdef q
-pkg-search: $(PKG_FILE)
- @cat $(PKG_FILE) | grep -i ${q} | awk 'BEGIN { FS = "\t" }; { print \
- "Name:\t\t" $$1 "\n" \
- "Repository:\t" $$2 "\n" \
- "Website:\t" $$3 "\n" \
- "Description:\t" $$4 "\n" }'
-else
-pkg-search:
- @echo "Usage: make pkg-search q=STRING"
endif
diff --git a/examples/chunked_hello_world/Makefile b/examples/chunked_hello_world/Makefile
index 7939941..e535e1c 100644
--- a/examples/chunked_hello_world/Makefile
+++ b/examples/chunked_hello_world/Makefile
@@ -1,6 +1,3 @@
PROJECT = chunked_hello_world
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/compress_response/Makefile b/examples/compress_response/Makefile
index 785ba6d..6b52fbe 100644
--- a/examples/compress_response/Makefile
+++ b/examples/compress_response/Makefile
@@ -1,6 +1,3 @@
PROJECT = compress_response
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/cookie/Makefile b/examples/cookie/Makefile
index d07e9b5..1895823 100644
--- a/examples/cookie/Makefile
+++ b/examples/cookie/Makefile
@@ -1,7 +1,3 @@
PROJECT = cookie
-
DEPS = cowboy erlydtl
-dep_cowboy = pkg://cowboy master
-dep_erlydtl = pkg://erlydtl master
-
include ../../erlang.mk
diff --git a/examples/echo_get/Makefile b/examples/echo_get/Makefile
index 30ab5f4..c3c3b30 100644
--- a/examples/echo_get/Makefile
+++ b/examples/echo_get/Makefile
@@ -1,6 +1,3 @@
PROJECT = echo_get
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/echo_post/Makefile b/examples/echo_post/Makefile
index 85cf181..bddaf0e 100644
--- a/examples/echo_post/Makefile
+++ b/examples/echo_post/Makefile
@@ -1,6 +1,3 @@
PROJECT = echo_post
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/error_hook/Makefile b/examples/error_hook/Makefile
index 5ddb343..575e919 100644
--- a/examples/error_hook/Makefile
+++ b/examples/error_hook/Makefile
@@ -1,6 +1,3 @@
PROJECT = error_hook
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/eventsource/Makefile b/examples/eventsource/Makefile
index 991cf8a..fd304d7 100644
--- a/examples/eventsource/Makefile
+++ b/examples/eventsource/Makefile
@@ -1,6 +1,3 @@
PROJECT = eventsource
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/hello_world/Makefile b/examples/hello_world/Makefile
index d63349e..72e0f88 100644
--- a/examples/hello_world/Makefile
+++ b/examples/hello_world/Makefile
@@ -1,6 +1,3 @@
PROJECT = hello_world
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/markdown_middleware/Makefile b/examples/markdown_middleware/Makefile
index f2e46ac..a46ae68 100644
--- a/examples/markdown_middleware/Makefile
+++ b/examples/markdown_middleware/Makefile
@@ -1,6 +1,3 @@
PROJECT = markdown_middleware
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/rest_basic_auth/Makefile b/examples/rest_basic_auth/Makefile
index 65c0ad8..dbc9450 100644
--- a/examples/rest_basic_auth/Makefile
+++ b/examples/rest_basic_auth/Makefile
@@ -1,6 +1,3 @@
PROJECT = rest_basic_auth
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/rest_hello_world/Makefile b/examples/rest_hello_world/Makefile
index f72c8af..7bb3b1e 100644
--- a/examples/rest_hello_world/Makefile
+++ b/examples/rest_hello_world/Makefile
@@ -1,6 +1,3 @@
PROJECT = rest_hello_world
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/rest_pastebin/Makefile b/examples/rest_pastebin/Makefile
index ea7764a..1914bea 100644
--- a/examples/rest_pastebin/Makefile
+++ b/examples/rest_pastebin/Makefile
@@ -1,6 +1,3 @@
PROJECT = rest_pastebin
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/rest_stream_response/Makefile b/examples/rest_stream_response/Makefile
index 576a0d2..c49d7d1 100644
--- a/examples/rest_stream_response/Makefile
+++ b/examples/rest_stream_response/Makefile
@@ -1,6 +1,3 @@
PROJECT = rest_stream_response
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/ssl_hello_world/Makefile b/examples/ssl_hello_world/Makefile
index 2817800..079817e 100644
--- a/examples/ssl_hello_world/Makefile
+++ b/examples/ssl_hello_world/Makefile
@@ -1,6 +1,3 @@
PROJECT = ssl_hello_world
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/static_world/Makefile b/examples/static_world/Makefile
index f52c0cf..eab221d 100644
--- a/examples/static_world/Makefile
+++ b/examples/static_world/Makefile
@@ -1,6 +1,3 @@
PROJECT = static_world
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/upload/Makefile b/examples/upload/Makefile
index 5f65387..e92ca82 100644
--- a/examples/upload/Makefile
+++ b/examples/upload/Makefile
@@ -1,6 +1,3 @@
PROJECT = upload
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/web_server/Makefile b/examples/web_server/Makefile
index c515c4b..7ff724f 100644
--- a/examples/web_server/Makefile
+++ b/examples/web_server/Makefile
@@ -1,6 +1,3 @@
PROJECT = web_server
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk
diff --git a/examples/websocket/Makefile b/examples/websocket/Makefile
index b9fcbff..81fd93b 100644
--- a/examples/websocket/Makefile
+++ b/examples/websocket/Makefile
@@ -1,6 +1,3 @@
PROJECT = websocket
-
DEPS = cowboy
-dep_cowboy = pkg://cowboy master
-
include ../../erlang.mk