From a7f484304415fac07bcfa908b8a74ba4cddc1a5b Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Tue, 22 Sep 2015 14:21:17 +0200
Subject: only newline for id if needed

---
 core/erlc.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/erlc.mk')

diff --git a/core/erlc.mk b/core/erlc.mk
index fbba7ae..ee029e5 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -56,8 +56,8 @@ ifeq ($(wildcard src/$(PROJECT)_app.erl),)
 define app_file
 {application, $(PROJECT), [
 	{description, "$(PROJECT_DESCRIPTION)"},
-	{vsn, "$(PROJECT_VERSION)"},
-	$(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma))
+	{vsn, "$(PROJECT_VERSION)"},$(if $(IS_DEP),
+	{id$(comma)$(space)"$(1)"}$(comma))
 	{modules, [$(call comma_list,$(2))]},
 	{registered, []},
 	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]}
@@ -67,8 +67,8 @@ else
 define app_file
 {application, $(PROJECT), [
 	{description, "$(PROJECT_DESCRIPTION)"},
-	{vsn, "$(PROJECT_VERSION)"},
-	$(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma))
+	{vsn, "$(PROJECT_VERSION)"},$(if $(IS_DEP),
+	{id$(comma)$(space)"$(1)"}$(comma))
 	{modules, [$(call comma_list,$(2))]},
 	{registered, [$(call comma_list,$(PROJECT)_sup $(PROJECT_REGISTERED))]},
 	{applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]},
-- 
cgit v1.2.3


From 2e54f1a1fa85937e960081247536cc1dd9bd8843 Mon Sep 17 00:00:00 2001
From: derwinlu <derwinlu+git@gmail.com>
Date: Wed, 23 Sep 2015 16:57:58 +0200
Subject: retain newlines in generated .app file

Replacing $(newline) occurances with \n before passing it to printf
instead of echo ensures valid output accross different platforms.
---
 core/erlc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/erlc.mk')

diff --git a/core/erlc.mk b/core/erlc.mk
index ee029e5..b215374 100644
--- a/core/erlc.mk
+++ b/core/erlc.mk
@@ -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) printf "$(subst $(newline),\n,$(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