Makefile in stylus-source-0.32.0

- old
+ new

@@ -1,15 +1,17 @@
 
 REPORTER ?= dot
-TM_DEST = ~/Library/Application\ Support/TextMate/Bundles
 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)
+lib/browser/diff.js: node_modules/diff/diff.js
+	cp node_modules/diff/diff.js lib/browser/diff.js
+
+mocha.js: $(SRC) $(SUPPORT) lib/browser/diff.js
 	@node support/compile $(SRC)
 	@cat \
 	  support/head.js \
 	  _mocha.js \
 	  support/tail.js \
@@ -28,28 +30,39 @@
 	@rm -fr ./$@
 	@jscoverage lib $@
 
 test: test-unit
 
-test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers
+test-all: test-bdd test-tdd test-qunit test-exports test-unit test-grep test-jsapi test-compilers test-glob test-requires
 
 test-jsapi:
 	@node test/jsapi
 
 test-unit:
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		test/acceptance/*.js \
+		--growl \
 		test/*.js
 
 test-compilers:
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--compilers coffee:coffee-script,foo:./test/compiler/foo \
 		test/acceptance/test.coffee \
 		test/acceptance/test.foo
 
+test-requires:
+	@./bin/mocha \
+		--reporter $(REPORTER) \
+		--compilers coffee:coffee-script \
+		--require test/acceptance/require/a.js \
+		--require test/acceptance/require/b.coffee \
+		--require test/acceptance/require/c.js \
+		--require test/acceptance/require/d.coffee \
+		test/acceptance/require/require.js
+
 test-bdd:
 	@./bin/mocha \
 		--reporter $(REPORTER) \
 		--ui bdd \
 		test/acceptance/interfaces/bdd
@@ -95,10 +108,13 @@
 	@./bin/mocha \
 	  --reporter $(REPORTER) \
 	  --async-only \
 	  test/acceptance/misc/asyncOnly
 
+test-glob:
+	@./test/acceptance/glob/glob.sh
+
 non-tty:
 	@./bin/mocha \
 		--reporter dot \
 		test/acceptance/interfaces/bdd 2>&1 > /tmp/dot.out
 
@@ -118,9 +134,8 @@
 
 	@echo spec:
 	@cat /tmp/spec.out
 
 tm:
-	mkdir -p $(TM_DEST)
-	cp -fr editors/$(TM_BUNDLE) $(TM_DEST)
+	@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 non-tty test-grep tm clean