X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=855313e13b7e9c00525abfd3a7d328b7aa88008a;hb=850fb73617adfeee44e7fee1fd577d10fec38b10;hp=50f785acab2c9b0090762aa998a9ed1f280243f8;hpb=7617164833913c65544c5686d4170d7a57f060ba;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 50f785a..855313e 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,28 +1,37 @@
 #!/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 \
-> /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 \
+dashed-canvas.js \
+plugins/base.js \
+plugins/annotations.js \
+plugins/axes.js \
+plugins/chart-labels.js \
+plugins/grid.js \
+plugins/legend.js \
+plugins/install.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
+(
+  echo '/*! @license Copyright 2011 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+  cat /tmp/dygraph-packed.js
+) > dygraph-combined.js
+chmod a+r dygraph-combined.js