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

diff --git a/Makefile b/Makefile
index b71596c..2ab31de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,50 @@
-# 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: generate-combined
+all: test generate-combined generate-documentation
+
+clean:
+	@echo cleaning...
+	@cp .dygraph-combined-clean.js dygraph-combined.js
+	rm -f docs/options.html
 
 generate-combined:
 	@echo Generating dygraph-combined.js
-	@generate-combined.sh
+	@./generate-combined.sh
+
+generate-documentation:
+	@echo Generating docs/options.html
+	@./generate-documentation.py > docs/options.html
+	@chmod a+r docs/options.html
+
+gwt: generate-gwt
+
+generate-gwt:
+	@echo Generating GWT JAR file
+	@./generate-jar.sh
+
+test:
+	@./test.sh
+	@./check-combined-unaffected.sh
+
+test-combined: move-combined test clean-combined-test
+
+move-combined: generate-combined
+	mv dygraph-combined.js dygraph-dev.js
+
+clean-combined-test: clean
+	@echo restoring combined
+	git checkout dygraph-dev.js
+	rm dygraph-combined.js.map
+
+lint:
+	@./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