Custom circle tweaks:

[dygraphs.git] / generate-combined.sh

diff --git a/generate-combined.sh b/generate-combined.sh
index a191b90..ea9f92b 100755 (executable)
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,19 +1,29 @@
 #!/bin/bash
 # Generates a single JS file that's easier to include.
 
-# Pack the dygraphs JS and rgbcolor
+# 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 \
+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 \
-strftime/strftime-min.js \
 /tmp/dygraph-packed.js \
 > dygraph-combined.js