X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=7cdc22aebf13aa017eb4c2d9280962fbfa6fe4c2;hb=99386b99835dfcc75053b4a9a4304b3d8a8546ad;hp=f50a86a6e074684b8708ddc3c66ba2b989b71e86;hpb=1533d06ea318fd54d6ab1fb4b43bb7aa490471b9;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index f50a86a..7cdc22a 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,37 +1,70 @@
 #!/bin/bash
 # Generates a single JS file that's easier to include.
 
+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 \
+    dashed-canvas.js \
+    dygraph-options.js \
+    dygraph-layout.js \
+    dygraph-canvas.js \
+    dygraph.js \
+    dygraph-utils.js \
+    dygraph-gviz.js \
+    dygraph-interaction-model.js \
+    dygraph-tickers.js \
+    dygraph-plugin-base.js \
+    plugins/*.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
+}
+
 # Pack all the JS together.
+CatSources () {
+  GetSources \
+  | xargs cat \
+  | perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,'
+}
 
-# This list needs to be kept in sync w/ the one in dygraph-dev.js
-# and the one in jsTestDriver.conf.
-cat \
-dygraph-layout.js \
-dygraph-canvas.js \
-dygraph.js \
-dygraph-utils.js \
-dygraph-gviz.js \
-dygraph-interaction-model.js \
-dygraph-range-selector.js \
-dygraph-tickers.js \
-rgbcolor/rgbcolor.js \
-strftime/strftime-min.js \
-dashed-canvas.js \
-plugins/base.js \
-plugins/annotations.js \
-plugins/axes.js \
-plugins/chart-labels \
-plugins/grid \
-plugins/legend.js \
-plugins/install.js \
-| perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,' \
-> /tmp/dygraph.js
+Copyright () {
+  echo '/*! @license Copyright 2014 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+}
 
-java -jar yuicompressor-2.4.2.jar /tmp/dygraph.js \
-> /tmp/dygraph-packed.js
+CatCompressed () {
+  Copyright
+  CatSources \
+  | grep -v '"use strict";' \
+  | node_modules/uglify-js/bin/uglifyjs -c warnings=false -m
+}
 
-(
-  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
+ACTION="${1:-update}"
+case "$ACTION" in
+ls)
+  GetSources
+  ;;
+cat)
+  Copyright
+  CatSources
+  ;;
+compress*|cat_compress*)
+  CatCompressed
+  ;;
+update)
+  CatCompressed > dygraph-combined.js
+  chmod a+r dygraph-combined.js
+  ;;
+*)
+  echo >&2 "Unknown action '$ACTION'"
+  exit 1
+  ;;
+esac