add HTML5 doctype to all tests

[dygraphs.git] / generate-combined.sh

diff --git a/generate-combined.sh b/generate-combined.sh
index a191b90..2b81f75 100755 (executable)
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -6,14 +6,15 @@ cat \
 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 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