Merge branch 'bstable'
This commit is contained in:
commit
9b4bb001c3
8
Makefile
8
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
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user