projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #449 from gregoryjordan/master
[dygraphs.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
1182b5a
..
2047c7f
100644
(file)
--- 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
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
generate-combined:
@echo Generating dygraph-combined.js
@@
-28,6
+28,7
@@
generate-gwt:
test:
@./test.sh
test:
@./test.sh
+ @./check-combined-unaffected.sh
test-combined: move-combined test clean-combined-test
test-combined: move-combined test clean-combined-test
@@
-40,3
+41,8
@@
clean-combined-test: clean
lint:
@./lint.sh
lint:
@./lint.sh
+
+publish:
+ ./generate-combined.sh
+ npm publish
+ git checkout dygraph-combined.js