Skip to content

Commit

Permalink
update Makefile to defer to npm (+4 squashed commits)
Browse files Browse the repository at this point in the history
Squashed commits:
[e8f4a39] don't use a pipe when building mocha.js
[9da9ec8] try to build mocha.js without make
[951bf29] remove mocha.js from vcs

- add `make mocha.js` to `prepublish` script
- add `npm test` to `preversion` script for fun
[c05a325] Add mocha.js to .gitignore

Makes contributing more dev-friendly, specially for newcomers to the
project.
  • Loading branch information
dasilvacontin authored and boneskull committed May 21, 2016
1 parent b76989c commit 0d2e8a1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12,725 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# The browser bundle is only rebuilt for releases by the maintainers
mocha.js

# Other stuff
coverage.html
lib-cov
.DS_Store
Expand Down
2 changes: 0 additions & 2 deletions .npmignore

This file was deleted.

14 changes: 3 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,8 @@ TM_BUNDLE = JavaScript\ mocha.tmbundle
SRC = $(shell find lib -name "*.js" -type f | sort)
SUPPORT = $(wildcard support/*.js)

all: mocha.js

mocha.js: $(SRC) $(SUPPORT)
@$(BROWSERIFY) ./support/browser-entry \
--ignore 'fs' \
--ignore 'glob' \
--ignore 'jade' \
--ignore 'path' \
--ignore 'supports-color' \
--exclude './lib-cov/mocha' > $@
all:
npm run build

clean:
rm -f mocha.js
Expand Down Expand Up @@ -152,4 +144,4 @@ non-tty:
tm:
@open editors/$(TM_BUNDLE)

.PHONY: test-cov test-jsapi test-compilers watch test test-all test-bdd test-tdd test-qunit test-exports test-unit test-integration non-tty tm clean
.PHONY: all test-cov test-jsapi test-compilers watch test test-all test-bdd test-tdd test-qunit test-exports test-unit test-integration non-tty tm clean
Loading

0 comments on commit 0d2e8a1

Please sign in to comment.