diff options
| -rw-r--r-- | build.config | 1 | ||||
| -rw-r--r-- | erlang.mk | 7 | ||||
| -rw-r--r-- | plugins/c_src.mk | 51 | ||||
| -rw-r--r-- | plugins/ct.mk | 7 |
4 files changed, 58 insertions, 8 deletions
diff --git a/build.config b/build.config index 252277f..cdd4115 100644 --- a/build.config +++ b/build.config @@ -9,6 +9,7 @@ core/erlc # Plugins. # # Comment to disable, uncomment to enable. +#plugins/c_src plugins/ct plugins/dialyzer plugins/erlydtl @@ -230,8 +230,7 @@ CT_RUN = ct_run \ -noshell \ -pa $(realpath ebin) $(DEPS_DIR)/*/ebin \ -dir test \ - -logdir logs \ - $(CT_OPTS) + -logdir logs CT_SUITES ?= @@ -241,7 +240,7 @@ test_$(1): clean deps app build-tests @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam endef @@ -253,7 +252,7 @@ tests: clean deps app build-tests @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam diff --git a/plugins/c_src.mk b/plugins/c_src.mk new file mode 100644 index 0000000..e1d8297 --- /dev/null +++ b/plugins/c_src.mk @@ -0,0 +1,51 @@ +# 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: clean-c_src +# todo + +# Configuration. + +C_SRC_DIR = $(CURDIR)/c_src +C_SRC_ENV ?= $(C_SRC_DIR)/env.mk +C_SRC_OPTS ?= +C_SRC_OUTPUT ?= $(CURDIR)/priv/$(PROJECT).so + +# Verbosity. + +c_src_verbose_0 = @echo " C_SRC " $(?F); +c_src_verbose = $(appsrc_verbose_$(V)) + +# Targets. + +ifeq ($(wildcard $(C_SRC_DIR)/Makefile),) + +app:: $(C_SRC_ENV) + @mkdir -p priv/ + $(c_src_verbose) gcc $(C_SRC_DIR)/*.c -fPIC -shared -o $(C_SRC_OUTPUT) \ + -I $(ERTS_INCLUDE_DIR) $(C_SRC_OPTS) + +$(C_SRC_ENV): + erl -noshell -noinput -eval "file:write_file(\"$(C_SRC_ENV)\", \ + io_lib:format(\"ERTS_INCLUDE_DIR ?= ~s/erts-~s/include/\", \ + [code:root_dir(), erlang:system_info(version)])), \ + init:stop()." + +-include $(C_SRC_ENV) + +else +ifneq ($(wildcard $(C_SRC_DIR),)) + +app:: + $(MAKE) -C $(C_SRC_DIR) + +clean:: + $(MAKE) -C $(C_SRC_DIR) clean + +endif +endif + +clean:: clean-c_src + +clean-c_src: + $(gen_verbose) rm -f $(C_SRC_ENV) $(C_SRC_OUTPUT) diff --git a/plugins/ct.mk b/plugins/ct.mk index e3e33f5..a6d8f52 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -33,8 +33,7 @@ CT_RUN = ct_run \ -noshell \ -pa $(realpath ebin) $(DEPS_DIR)/*/ebin \ -dir test \ - -logdir logs \ - $(CT_OPTS) + -logdir logs $(foreach dep,$(TEST_DEPS),$(eval $(call dep_target,$(dep)))) @@ -50,7 +49,7 @@ tests-ct: clean deps app build-ct-suites @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(CT_SUITES)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam @@ -60,7 +59,7 @@ ct-$(1): clean deps app build-tests @if [ -d "test" ] ; \ then \ mkdir -p logs/ ; \ - $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) ; \ + $(CT_RUN) -suite $(addsuffix _SUITE,$(1)) $(CT_OPTS) ; \ fi $(gen_verbose) rm -f test/*.beam endef |