X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=ea9f92bd6738f4a7df291ea39172ba092e539462;hb=857a693198b506e516a541848491a0c160953b8e;hp=92740ddddfd09f2e970401199aec84083c570915;hpb=fbe31dc8001c5122d8fe980b4eede83fd71a835c;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 92740dd..ea9f92b 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,33 +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.
 
-# Generate the packed version of the subset of PlotKit needed by dygraphs.
-# This saves ~30k
-cd plotkit_v091
-./scripts/pack.py Base > /tmp/plotkit-packed.js
-cd ..
+# Pack all the JS together.
 
-# 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.
+# 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 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