add HTML5 doctype to all tests

[dygraphs.git] / generate-combined.sh

diff --git a/generate-combined.sh b/generate-combined.sh
index 3dde7ed..2b81f75 100755 (executable)
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,16 +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.
-
-# 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 ..
 
+# Pack the dygraphs JS and rgbcolor
 cat \
-mochikit_v14/packed/MochiKit/MochiKit.js \
-/tmp/plotkit-packed.js \
 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 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/dygraph-packed.js \
 > dygraph-combined.js