X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=2b81f75decfbef7eff40f0b283dff6debd1830e7;hb=54425b14df388e9337a1d77876512bb60ba74c3b;hp=1fa709477d8171b99a384219aa12d961e35216e2;hpb=f474c2a348651a43addaf796d31aab16e5851b74;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 1fa7094..2b81f75 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -1,27 +1,20 @@
 #!/bin/bash
 # Generates a single JS file that's easier to include.
 
-# Pack up just the bits of MochiKit that we need.
-cd mochikit_v14
-./scripts/pack.py \
-Base \
-> /tmp/mochikit-packed.js
-cd ..
-
 # Pack the dygraphs JS and rgbcolor
 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 \
-/tmp/mochikit-packed.js \
-strftime/strftime-min.js \
 /tmp/dygraph-packed.js \
 > dygraph-combined.js