X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=40c8019fa7be13c1a3291acb4386fe32d521c7d6;hb=36a27704957dda706074a857884d52c1cf5a974c;hp=3dde7ed9068cefcd596019c89161ef989c101571;hpb=43f15770a2542b2b199b936f2e31509f736fe055;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 3dde7ed..40c8019 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,16 +1,39 @@
 #!/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 all the JS together.
 
+# This list needs to be kept in sync w/ the one in dygraph-dev.js
+# and the one in jsTestDriver.conf.
 cat \
-mochikit_v14/packed/MochiKit/MochiKit.js \
-/tmp/plotkit-packed.js \
+strftime/strftime-min.js \
+rgbcolor/rgbcolor.js \
+stacktrace.js \
+dashed-canvas.js \
+dygraph-options.js \
+dygraph-layout.js \
 dygraph-canvas.js \
 dygraph.js \
-> dygraph-combined.js
+dygraph-utils.js \
+dygraph-gviz.js \
+dygraph-interaction-model.js \
+dygraph-range-selector.js \
+dygraph-tickers.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 yuicompressor-2.4.2.jar /tmp/dygraph.js \
+> /tmp/dygraph-packed.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