X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=0f3064a4c125850df4f7e97577d8704adec1a816;hb=48e614acf3084b9836803f8b014bf0e65f1ca119;hp=22799c94bd3bcbeb2fb7a29beaa2cd09967836e1;hpb=5fb1199a967846f18b99b00e06ce60272318796a;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 22799c9..0f3064a 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,28 +1,28 @@
 #!/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 Iter DOM Style Color Signal \
-> /tmp/mochikit-packed.js
-cd ..
+# Pack all the JS together.
 
-# Pack the dygraphs JS. This saves another 22k.
+# 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-tickers.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 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 \
-strftime/strftime-min.js \
 /tmp/dygraph-packed.js \
 > dygraph-combined.js