X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=58ab0d793e9e60246a68c533ec1916b2d1448cb2;hb=250bb62bb4614a3c1189c9b5b8b99e182a11db6e;hp=44638aa93e2edcfe42f28745b959a13a3e0543ad;hpb=b0c3b7300e0faea480835763343e64884b169fb5;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 44638aa..58ab0d7 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,28 +1,69 @@
 #!/bin/bash
 # Generates a single JS file that's easier to include.
-# This packed JS includes a partial copy of MochiKit and PlotKit.
-# It winds up being 146k uncompressed and 37k gzipped.
 
-# Do the same for MochiKit. This save another 77k.
-cd mochikit_v14
-./scripts/pack.py \
-Base Color DOM Style Signal \
-> /tmp/mochikit-packed.js
-cd ..
+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 the dygraphs JS. This saves another 22k.
-cat \
-dygraph-canvas.js \
-dygraph.js \
-> /tmp/dygraph.js
+# Pack all the JS together.
+CatSources () {
+  GetSources \
+  | xargs cat \
+  | perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,'
+}
 
-java -jar custom_rhino.jar -c /tmp/dygraph.js \
-> /tmp/dygraph-packed.js
+Copyright () {
+  echo '/*! @license Copyright 2011 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+}
 
-# TODO(danvk): ensure the dygraphs copyright, etc. gets into the packed js.
+CatCompressed () {
+  Copyright
+  CatSources \
+  | java -jar yuicompressor-2.4.2.jar --type js
+}
 
-cat \
-/tmp/mochikit-packed.js \
-strftime/strftime-min.js \
-/tmp/dygraph-packed.js \
-> 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