From cc9923f28ab3fc19f59f8882d90a53803a3d5d0e Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 9 Jul 2016 17:32:14 -0700 Subject: [PATCH 1/2] Suppress printing of filenames when concatenating files on Windows. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b45d66555..78a2e7a67 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ ifdef ComSpec BIN := $(subst /,\,node_modules/.bin/) RMDIR := -rmdir /s /q RM := -del - CAT = type $(subst /,\,$1) > $(subst /,\,$2) + CAT = type $(subst /,\,$1) > $(subst /,\,$2) 2>NUL MKDIR = -mkdir $(subst /,\,$@) QUOTE = $(patsubst %,"%",$1) else From dfdc8e58392c4f86b0fe307c36007a12dd6926d2 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 9 Jul 2016 17:54:01 -0700 Subject: [PATCH 2/2] Don't print list of files we're concatenating. #886 --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 78a2e7a67..5e2b15d17 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,8 @@ testbuilds/crx$1 : $$(MKDIR) testbuilds/crx$1/script.js : $$(call pieces,crx) | testbuilds/crx$1 .events/compile - $$(call CAT,$$(call QUOTE,$$(call pieces,crx)),$$@) + @echo Concatenating: $$@ + @$$(call CAT,$$(call QUOTE,$$(call pieces,crx)),$$@) testbuilds/crx$1/eventPage.js : tmp/eventPage.js | testbuilds/crx$1 $$(CP) @@ -195,7 +196,8 @@ testbuilds/$(name)$1.meta.js : src/meta/metadata.js src/meta/icon48.png version. $(template) $$< $$@ type=userscript channel=$1 testbuilds/$(name)$1.user.js : testbuilds/$(name)$1.meta.js tmp/meta-newline.js $$(call pieces,userscript) | .events/compile - $$(call CAT,testbuilds/$(name)$1.meta.js tmp/meta-newline.js $$(call QUOTE,$$(call pieces,userscript)),$$@) + @echo Concatenating: $$@ + @$$(call CAT,testbuilds/$(name)$1.meta.js tmp/meta-newline.js $$(call QUOTE,$$(call pieces,userscript)),$$@) endef