X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=2b81f75decfbef7eff40f0b283dff6debd1830e7;hb=54425b14df388e9337a1d77876512bb60ba74c3b;hp=fb19c7dfebb2f22045b820a2745322ee998124b0;hpb=6219c9d62f929c5a476e82ee67dfec45db209f84;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index fb19c7d..2b81f75 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,33 +1,20 @@
 #!/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.
 
-# Generate the packed version of the subset of PlotKit needed by dygraphs.
-# This saves ~30k
-cd plotkit_v091
-./scripts/pack.py Base Layout Canvas > /tmp/plotkit-packed.js
-cd ..
-
-# Do the same for MochiKit. This save another 77k.
-cd mochikit_v14
-./scripts/pack.py \
-Base Iter DOM Style Color Signal \
-> /tmp/mochikit-packed.js
-cd ..
-
-# Pack the dygraphs JS. This saves another 22k.
+# Pack the dygraphs JS and rgbcolor
 cat \
 dygraph-canvas.js \
 dygraph.js \
+rgbcolor/rgbcolor.js \
+strftime/strftime-min.js \
+| perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,' \
 > /tmp/dygraph.js
 
-java -jar plotkit_v091/scripts/custom_rhino.jar -c /tmp/dygraph.js \
+java -jar yuicompressor-2.4.2.jar /tmp/dygraph.js \
 > /tmp/dygraph-packed.js
 
+# TODO(danvk): ensure the dygraphs copyright, etc. gets into the packed js.
+
 cat \
-/tmp/mochikit-packed.js \
-/tmp/plotkit-packed.js \
-strftime/strftime-min.js \
 /tmp/dygraph-packed.js \
 > dygraph-combined.js