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 #309 from hulkholden/hidpi
[dygraphs.git]
/
generate-combined.sh
diff --git
a/generate-combined.sh
b/generate-combined.sh
index
4d062aa
..
7cdc22a
100755
(executable)
--- a/
generate-combined.sh
+++ b/
generate-combined.sh
@@
-5,9
+5,6
@@
GetSources () {
# This list needs to be kept in sync w/ the one in dygraph-dev.js
# and the one in jsTestDriver.conf. Order matters, except for the plugins.
for F in \
# This list needs to be kept in sync w/ the one in dygraph-dev.js
# and the one in jsTestDriver.conf. Order matters, except for the plugins.
for F in \
- strftime/strftime-min.js \
- rgbcolor/rgbcolor.js \
- stacktrace.js \
dashed-canvas.js \
dygraph-options.js \
dygraph-layout.js \
dashed-canvas.js \
dygraph-options.js \
dygraph-layout.js \
@@
-19,7
+16,14
@@
GetSources () {
dygraph-tickers.js \
dygraph-plugin-base.js \
plugins/*.js \
dygraph-tickers.js \
dygraph-plugin-base.js \
plugins/*.js \
- dygraph-plugin-install.js
+ dygraph-plugin-install.js \
+ datahandler/datahandler.js \
+ datahandler/default.js \
+ datahandler/default-fractions.js \
+ datahandler/bars.js \
+ datahandler/bars-custom.js \
+ datahandler/bars-error.js \
+ datahandler/bars-fractions.js
do
echo "$F"
done
do
echo "$F"
done
@@
-33,13
+37,14
@@
CatSources () {
}
Copyright () {
}
Copyright () {
- echo '/*! @license Copyright 201
1
Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+ echo '/*! @license Copyright 201
4
Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
}
CatCompressed () {
Copyright
CatSources \
}
CatCompressed () {
Copyright
CatSources \
- | java -jar yuicompressor-2.4.2.jar --type js
+ | grep -v '"use strict";' \
+ | node_modules/uglify-js/bin/uglifyjs -c warnings=false -m
}
ACTION="${1:-update}"
}
ACTION="${1:-update}"
@@
-55,8
+60,8
@@
compress*|cat_compress*)
CatCompressed
;;
update)
CatCompressed
;;
update)
- CatCompressed > dygraph-
min
.js
- chmod a+r dygraph-
min
.js
+ CatCompressed > dygraph-
combined
.js
+ chmod a+r dygraph-
combined
.js
;;
*)
echo >&2 "Unknown action '$ACTION'"
;;
*)
echo >&2 "Unknown action '$ACTION'"