aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-09-18 14:34:58 +0200
committerLoïc Hoguin <[email protected]>2015-09-18 14:34:58 +0200
commit5bcfeece2f55cd8570b1356d9982756e99f90b40 (patch)
treeb3ec855b58fbdb522a23c5739dad905753232a37 /core
parent9c3f9f1dfe73738d182ddd9832406b2ab61293f7 (diff)
downloaderlang.mk-5bcfeece2f55cd8570b1356d9982756e99f90b40.tar.gz
erlang.mk-5bcfeece2f55cd8570b1356d9982756e99f90b40.tar.bz2
erlang.mk-5bcfeece2f55cd8570b1356d9982756e99f90b40.zip
Test "no .app.src" by default, test legacy with LEGACY=1
Also fixes two bugs with the new "no .app.src" method. All tests now pass with both methods. We can now test specific cases with make check c=$CASE.
Diffstat (limited to 'core')
-rw-r--r--core/erlc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/erlc.mk b/core/erlc.mk
index 1a73698..fbba7ae 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -57,7 +57,7 @@ define app_file
{application, $(PROJECT), [
{description, "$(PROJECT_DESCRIPTION)"},
{vsn, "$(PROJECT_VERSION)"},
- $(if $(IS_DEP),{id, "$(1)"},)
+ $(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma))
{modules, [$(call comma_list,$(2))]},
{registered, []},
{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]}
@@ -201,7 +201,7 @@ ebin/$(PROJECT).app:: $(ERL_FILES) $(CORE_FILES)
$(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename \
$(filter-out $(ERLC_EXCLUDE_PATHS),$(ERL_FILES) $(CORE_FILES)))))))
ifeq ($(wildcard src/$(PROJECT).app.src),)
- $(app_verbose) echo $(subst $(newline),,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES)))) \
+ $(app_verbose) echo "$(subst $(newline),,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \
> ebin/$(PROJECT).app
else
$(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \