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

diff --git a/generate-combined.sh b/generate-combined.sh
index 44638aa..ea9f92b 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,28 +1,29 @@
 #!/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 ..
+# 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-range-selector.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