From 9797223d8070362ad4fe5d3c1bd9990301ab0665 Mon Sep 17 00:00:00 2001 From: Nick Gates Date: Wed, 6 Jan 2016 20:21:01 +0000 Subject: Remove spaces after commas globally When preparing erlc_opts, remove all comma/whitespace pairs instead of just the first --- core/compat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/compat.mk b/core/compat.mk index f936768..89607ab 100644 --- a/core/compat.mk +++ b/core/compat.mk @@ -6,7 +6,7 @@ # We strip out -Werror because we don't want to fail due to # warnings when used as a dependency. -compat_prepare_erlc_opts = $(shell echo "$1" | sed 's/, */,/') +compat_prepare_erlc_opts = $(shell echo "$1" | sed 's/, */,/g') define compat_convert_erlc_opts $(if $(filter-out -Werror,$1),\ -- cgit v1.2.3 From 9a90461dbcdc5406ba0936e07d13bb76ad12cb00 Mon Sep 17 00:00:00 2001 From: Nick Gates Date: Wed, 6 Jan 2016 20:57:24 +0000 Subject: Add a second comma/space to test global substitutions --- test/core_compat.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/core_compat.mk b/test/core_compat.mk index d38d4ef..73a9da1 100644 --- a/test/core_compat.mk +++ b/test/core_compat.mk @@ -220,7 +220,7 @@ core-compat-rebar-pt: build clean $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = lager\n"}' $(APP)/Makefile $i "Add the lager_transform parse_transform to ERLC_OPTS" - $t echo "ERLC_OPTS += +'{parse_transform, lager_transform}'" >> $(APP)/Makefile + $t echo "ERLC_OPTS += +'{parse_transform, lager_transform}' +'{lager_truncation_size, 1234}'" >> $(APP)/Makefile $i "Build the application" $t $(MAKE) -C $(APP) $v @@ -236,6 +236,7 @@ core-compat-rebar-pt: build clean {ok, C} = file:consult(\"$(APP)/rebar.config\"), \ {_, Opts} = lists:keyfind(erl_opts, 1, C), \ true = lists:member({parse_transform, lager_transform}, Opts), \ + true = lists:member({lager_truncation_size, 1234}, Opts), \ halt()" # For the new build method, we have to simulate keeping the .app file -- cgit v1.2.3