annotations plugin appears to be working

[dygraphs.git] / generate-combined.sh

diff --git a/generate-combined.sh b/generate-combined.sh
index 038aff8..a065ffa 100755 (executable)
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -18,6 +18,8 @@ rgbcolor/rgbcolor.js \
 strftime/strftime-min.js \
 plugins/base.js \
 plugins/legend.js \
+plugins/chart-labels \
+plugins/annotations.js \
 plugins/install.js \
 | perl -ne 'print unless m,REMOVE_FOR_COMBINED,..m,/REMOVE_FOR_COMBINED,' \
 > /tmp/dygraph.js
@@ -25,9 +27,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