X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=2ab31deab0d7ec9f9f40962692486d0dd1eaa47a;hb=f9b5a82c0e67c25b47cc5a40b46ca2f1056c35f5;hp=81ae456dcb548ec4dafbfe90194f6f08a486e133;hpb=8bc2eb3aecd9f9eec85b164f89d70e16d868764e;p=dygraphs.git

diff --git a/Makefile b/Makefile
index 81ae456..2ab31de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,4 @@
-# Run the generate-combined.sh script.
-# This Makefile isn't really necessary, but it serves as a "indicator"
-# to new users that they need to do a "build" of sorts.
-#
-# Dean Wampler <dean@deanwampler.com> March 22, 2010
+# You should run "npm install" before running any commands in this Makefile.
 
 all: test generate-combined generate-documentation
 
@@ -28,6 +24,7 @@ generate-gwt:
 
 test:
 	@./test.sh
+	@./check-combined-unaffected.sh
 
 test-combined: move-combined test clean-combined-test
 
@@ -37,10 +34,17 @@ move-combined: generate-combined
 clean-combined-test: clean
 	@echo restoring combined
 	git checkout dygraph-dev.js
+	rm dygraph-combined.js.map
 
 lint:
-	@./lint.sh
+	@./generate-combined.sh ls \
+	    | grep -v 'polyfills' \
+	    | xargs ./node_modules/.bin/jshint
+
+# Commands to run for continuous integration on Travis-CI
+travis: test test-combined lint
 
 publish:
-	@./generate-combined.sh
-	@npm publish
+	./generate-combined.sh
+	npm publish
+	git checkout dygraph-combined.js