X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=inline;f=Makefile;h=2047c7fa1c0112044788c417ecc3beb7dd77b30a;hb=33b5c4b245bf29f3e908931bf70dde00b5fc8a51;hp=007468ed43511a82170b7533939a1ee23d0e80de;hpb=21ebe38bb1eeae3a7fd73335a411bfd81c66d985;p=dygraphs.git

diff --git a/Makefile b/Makefile
index 007468e..2047c7f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ 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 +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