projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove labelsKMB and labelsKMG2 from Dygraph.axes_.
[dygraphs.git]
/
generate-combined.sh
diff --git
a/generate-combined.sh
b/generate-combined.sh
index
304b1cf
..
40c8019
100755
(executable)
--- a/
generate-combined.sh
+++ b/
generate-combined.sh
@@
-6,6
+6,11
@@
# This list needs to be kept in sync w/ the one in dygraph-dev.js
# and the one in jsTestDriver.conf.
cat \
# This list needs to be kept in sync w/ the one in dygraph-dev.js
# and the one in jsTestDriver.conf.
cat \
+strftime/strftime-min.js \
+rgbcolor/rgbcolor.js \
+stacktrace.js \
+dashed-canvas.js \
+dygraph-options.js \
dygraph-layout.js \
dygraph-canvas.js \
dygraph.js \
dygraph-layout.js \
dygraph-canvas.js \
dygraph.js \
@@
-14,9
+19,11
@@
dygraph-gviz.js \
dygraph-interaction-model.js \
dygraph-range-selector.js \
dygraph-tickers.js \
dygraph-interaction-model.js \
dygraph-range-selector.js \
dygraph-tickers.js \
-rgbcolor/rgbcolor.js \
-strftime/strftime-min.js \
plugins/base.js \
plugins/base.js \
+plugins/annotations.js \
+plugins/axes.js \
+plugins/chart-labels.js \
+plugins/grid.js \
plugins/legend.js \
plugins/install.js \
| perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,' \
plugins/legend.js \
plugins/install.js \
| perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,' \
@@
-26,7
+33,7
@@
java -jar yuicompressor-2.4.2.jar /tmp/dygraph.js \
> /tmp/dygraph-packed.js
(
> /tmp/dygraph-packed.js
(
- echo '/*!
dygraphs v1.2 dygraphs.com | dygraphs.com/license
*/'
+ echo '/*!
@license Copyright 2011 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT)
*/'
cat /tmp/dygraph-packed.js
) > dygraph-combined.js
chmod a+r dygraph-combined.js
cat /tmp/dygraph-packed.js
) > dygraph-combined.js
chmod a+r dygraph-combined.js