Merge branch 'bstable'
This commit is contained in:
commit
94d3ab7bed
6
Makefile
6
Makefile
@ -121,9 +121,9 @@ jshint := $(foreach f,script-crx eventPage script-userscript,.events/jshint.$(f)
|
|||||||
|
|
||||||
jshint_parts := $(foreach p,$(parts_userscript),.events/jshint.script$(p))
|
jshint_parts := $(foreach p,$(parts_userscript),.events/jshint.script$(p))
|
||||||
|
|
||||||
default : install
|
default : jshint_parts install
|
||||||
|
|
||||||
all : bds install
|
all : jshint bds install
|
||||||
|
|
||||||
.events tmp tmp/parts testbuilds builds :
|
.events tmp tmp/parts testbuilds builds :
|
||||||
$(MKDIR)
|
$(MKDIR)
|
||||||
@ -228,7 +228,7 @@ tmp/parts/.jshintrc : src/meta/jshint.json $(template_deps) | tmp/parts
|
|||||||
install.json :
|
install.json :
|
||||||
echo {}> $@
|
echo {}> $@
|
||||||
|
|
||||||
.events/install : $(testbds) $(jshint_parts) install.json tools/install.js | .events
|
.events/install : $(testbds) install.json tools/install.js | .events
|
||||||
node tools/install.js
|
node tools/install.js
|
||||||
echo -> $@
|
echo -> $@
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user