X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=26d4a422e00d1effa640270faf1ab0697c64a5f7;hb=d0da31d021ee7a89b378182a60bf28f0873fc87b;hp=4d062aa97831cc071b8c2f5aa32c650b9efa392c;hpb=42d73d9b5711d8da068d62cc7330492523c90966;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 4d062aa..26d4a42 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -2,12 +2,17 @@
 # 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 \
-    strftime/strftime-min.js \
-    rgbcolor/rgbcolor.js \
-    stacktrace.js \
+    polyfills/console.js \
     dashed-canvas.js \
     dygraph-options.js \
     dygraph-layout.js \
@@ -19,7 +24,15 @@ GetSources () {
     dygraph-tickers.js \
     dygraph-plugin-base.js \
     plugins/*.js \
-    dygraph-plugin-install.js
+    dygraph-plugin-install.js \
+    $maybe_options_reference \
+    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
@@ -28,18 +41,21 @@ 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 () {
-  echo '/*! @license Copyright 2011 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+  echo '/*! @license Copyright 2014 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
 }
 
 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}"
@@ -51,12 +67,18 @@ cat)
   Copyright
   CatSources
   ;;
+cat-dev)
+  DEBUG=true
+  Copyright
+  CatSources
+  ;;
 compress*|cat_compress*)
   CatCompressed
   ;;
 update)
-  CatCompressed > dygraph-min.js
-  chmod a+r dygraph-min.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'"