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]
/
generate-combined.sh
diff --git
a/generate-combined.sh
b/generate-combined.sh
index
7cdc22a
..
26d4a42
100755
(executable)
--- a/
generate-combined.sh
+++ b/
generate-combined.sh
@@
-2,9
+2,17
@@
# Generates a single JS file that's easier to include.
GetSources () {
# Generates a single JS file that's easier to include.
GetSources () {
+ # Include dyraph-options-reference only if DEBUG environment variable is set.
+ if [ ! -z "$DEBUG" ]; then
+ maybe_options_reference=dygraph-options-reference.js
+ else
+ maybe_options_reference=''
+ fi
+
# 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 \
+ polyfills/console.js \
dashed-canvas.js \
dygraph-options.js \
dygraph-layout.js \
dashed-canvas.js \
dygraph-options.js \
dygraph-layout.js \
@@
-17,6
+25,7
@@
GetSources () {
dygraph-plugin-base.js \
plugins/*.js \
dygraph-plugin-install.js \
dygraph-plugin-base.js \
plugins/*.js \
dygraph-plugin-install.js \
+ $maybe_options_reference \
datahandler/datahandler.js \
datahandler/default.js \
datahandler/default-fractions.js \
datahandler/datahandler.js \
datahandler/default.js \
datahandler/default-fractions.js \
@@
-32,8
+41,7
@@
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 () {
@@
-41,10
+49,13
@@
Copyright () {
}
CatCompressed () {
}
CatCompressed () {
- Copyright
- CatSources \
- | grep -v '"use strict";' \
- | node_modules/uglify-js/bin/uglifyjs -c warnings=false -m
+ node_modules/uglify-js/bin/uglifyjs \
+ $(GetSources | xargs) \
+ --compress warnings=false \
+ --mangle \
+ --define DEBUG=false \
+ --preamble "$(Copyright)" \
+ $*
}
ACTION="${1:-update}"
}
ACTION="${1:-update}"
@@
-56,12
+67,18
@@
cat)
Copyright
CatSources
;;
Copyright
CatSources
;;
+cat-dev)
+ DEBUG=true
+ Copyright
+ CatSources
+ ;;
compress*|cat_compress*)
CatCompressed
;;
update)
compress*|cat_compress*)
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'"