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 #504 from danvk/death-to-ie
[dygraphs.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
81ae456
..
2ab31de
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,8
+1,4
@@
-# 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: test generate-combined generate-documentation
all: test generate-combined generate-documentation
@@
-28,6
+24,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
@@
-37,10
+34,17
@@
move-combined: generate-combined
clean-combined-test: clean
@echo restoring combined
git checkout dygraph-dev.js
clean-combined-test: clean
@echo restoring combined
git checkout dygraph-dev.js
+ rm dygraph-combined.js.map
lint:
lint:
- @./lint.sh
+ @./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:
publish:
- @./generate-combined.sh
- @npm publish
+ ./generate-combined.sh
+ npm publish
+ git checkout dygraph-combined.js