X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=40c8019fa7be13c1a3291acb4386fe32d521c7d6;hb=fe631b38a1490b6573018e266f512bce0207d2ab;hp=038aff8a96625a7d4d5bde87b9ff40858a6a46e1;hpb=4d3672ff9d8739616db354bfb736fc2c52b71766;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 038aff8..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,9 +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