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

diff --git a/generate-combined.sh b/generate-combined.sh
index d38d220..40c8019 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -6,6 +6,11 @@
 # This list needs to be kept in sync w/ the one in dygraph-dev.js
 # and the one in jsTestDriver.conf.
 cat \
+strftime/strftime-min.js \
+rgbcolor/rgbcolor.js \
+stacktrace.js \
+dashed-canvas.js \
+dygraph-options.js \
 dygraph-layout.js \
 dygraph-canvas.js \
 dygraph.js \
@@ -14,9 +19,11 @@ dygraph-gviz.js \
 dygraph-interaction-model.js \
 dygraph-range-selector.js \
 dygraph-tickers.js \
-rgbcolor/rgbcolor.js \
-strftime/strftime-min.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,' \
@@ -25,8 +32,8 @@ plugins/install.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/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