projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turn on more lint warnings; clear up some directives
[dygraphs.git]
/
generate-combined.sh
diff --git
a/generate-combined.sh
b/generate-combined.sh
index
09f316f
..
a224156
100755
(executable)
--- a/
generate-combined.sh
+++ b/
generate-combined.sh
@@
-5,9
+5,7
@@
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 \
+ polyfills/console.js \
dashed-canvas.js \
dygraph-options.js \
dygraph-layout.js \
dashed-canvas.js \
dygraph-options.js \
dygraph-layout.js \
@@
-35,18
+33,21
@@
GetSources () {
# Pack all the JS together.
CatSources () {
GetSources \
# Pack all the JS together.
CatSources () {
GetSources \
- | xargs cat \
- | perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,'
+ | xargs cat
}
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 () {
}
CatCompressed () {
- Copyright
- CatSources \
- | java -jar yuicompressor-2.4.2.jar --type js
+ node_modules/uglify-js/bin/uglifyjs \
+ $(GetSources | xargs) \
+ --compress warnings=false \
+ --mangle \
+ --define DEBUG=false \
+ --preamble "$(Copyright)" \
+ $*
}
ACTION="${1:-update}"
}
ACTION="${1:-update}"
@@
-62,8
+63,9
@@
compress*|cat_compress*)
CatCompressed
;;
update)
CatCompressed
;;
update)
- CatCompressed > dygraph-combined.js
- chmod a+r dygraph-combined.js
+ CatCompressed --source-map dygraph-combined.js.map \
+ > dygraph-combined.js
+ chmod a+r dygraph-combined.js dygraph-combined.js.map
;;
*)
echo >&2 "Unknown action '$ACTION'"
;;
*)
echo >&2 "Unknown action '$ACTION'"