Fix bug 428, add test which catches exception. What an annoying little bug.

[dygraphs.git] / Makefile

diff --git a/Makefile b/Makefile
index b71596c..e07bc1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,39 @@
 #
 # Dean Wampler <dean@deanwampler.com> March 22, 2010
 
-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
+
+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
+
+lint:
+       @./lint.sh