X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=Makefile;h=2ab31deab0d7ec9f9f40962692486d0dd1eaa47a;hb=1f0f434a67305ccb3d54a0bbd16a1b6d9421fffb;hp=1182b5aa4fa28926a6a31ac2d4b69b808f46889e;hpb=406714e12102ee6714774e2801622577ca0daa16;p=dygraphs.git

diff --git a/Makefile b/Makefile
index 1182b5a..2ab31de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,11 @@
-# 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
 
 clean:
 	@echo cleaning...
 	@cp .dygraph-combined-clean.js dygraph-combined.js
-	rm docs/options.html
+	rm -f docs/options.html
 
 generate-combined:
 	@echo Generating dygraph-combined.js
@@ -28,6 +24,7 @@ generate-gwt:
 
 test:
 	@./test.sh
+	@./check-combined-unaffected.sh
 
 test-combined: move-combined test clean-combined-test
 
@@ -37,6 +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
+	git checkout dygraph-combined.js