Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tell make goals not safe to be run in parallel.

Browse Source
This commit is contained in:
ccd0 2016-04-17 00:34:04 -07:00
parent 1d232b4cfe
commit 33494f879a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@ -14,6 +14,11 @@ else
ESC_DOLLAR = \$$ ESC_DOLLAR = \$$
endif endif
npgoals := clean cleanall $(foreach i,1 2 3 4,bump$(i)) beta stable web
ifneq "$(filter $(npgoals),$(MAKECMDGOALS))" ""
.NOTPARALLEL :
endif
coffee := $(BIN)coffee -c --no-header coffee := $(BIN)coffee -c --no-header
coffee_deps := node_modules/coffee-script/package.json coffee_deps := node_modules/coffee-script/package.json
template := node tools/template.js template := node tools/template.js
@ -219,17 +224,7 @@ dist :
.SECONDARY : .SECONDARY :
.PHONY: \ .PHONY: default all script crx release jshint install tag distready $(npgoals)
default all clean cleanall script crx release jshint install \
tag $(foreach i,1 2 3 4,$(bump$(i))) distready beta stable web
clean :
$(RMDIR) tmp testbuilds .events dist
$(RM) .tests_enabled
git worktree prune
cleanall : clean
$(RMDIR) builds
script : $(script) script : $(script)
@ -245,11 +240,6 @@ tag : .events/CHANGELOG $(jshint) $(release)
git commit -am "Release $(name) v$(version)." git commit -am "Release $(name) v$(version)."
git tag -a $(version) -m "$(name) v$(version)." git tag -a $(version) -m "$(name) v$(version)."
bump% :
$(MAKE) cleanall
node tools/bump.js $*
$(MAKE) tag install
distready : | dist distready : | dist
cd dist && git checkout $(distBranch) cd dist && git checkout $(distBranch)
cd dist && git pull cd dist && git pull
@ -257,6 +247,18 @@ distready : | dist
dist/index.html : test.html distready dist/index.html : test.html distready
$(CP) $(CP)
clean :
$(RMDIR) tmp testbuilds .events dist
$(RM) .tests_enabled
git worktree prune
cleanall : clean
$(RMDIR) builds
$(foreach i,1 2 3 4,bump$(i)) : cleanall
node tools/bump.js $(subst bump,,$@)
$(MAKE) tag install
beta : distready beta : distready
git tag -af beta -m "$(nameHuman) v$(version)." git tag -af beta -m "$(nameHuman) v$(version)."
cd dist && git merge --no-commit -s ours beta cd dist && git merge --no-commit -s ours beta