From 5bcfeece2f55cd8570b1356d9982756e99f90b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 18 Sep 2015 14:34:58 +0200
Subject: 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.
---
 core/erlc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/erlc.mk')

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 \
-- 
cgit v1.2.3