Merge pull request #465 from danvk/callback-this

[dygraphs.git] / Makefile

diff --git a/Makefile b/Makefile
index a307c72..2047c7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,22 @@
 #
 # Dean Wampler <dean@deanwampler.com> March 22, 2010
 
-all: test 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-documentation:
+       @echo Generating docs/options.html
+       @./generate-documentation.py > docs/options.html
+       @chmod a+r docs/options.html
+
 gwt: generate-gwt
 
 generate-gwt:
@@ -18,6 +28,21 @@ generate-gwt:
 
 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
 
 lint:
        @./lint.sh
+
+publish:
+       ./generate-combined.sh
+       npm publish
+       git checkout dygraph-combined.js