X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=30c0a7e3445db88808bea7b94267846c76112e93;hb=3a0e53a45ffaf12515f99f905221ba59490961fa;hp=58ab0d793e9e60246a68c533ec1916b2d1448cb2;hpb=335011fd4473f55aaaceb69726d15e0063373149;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 58ab0d7..30c0a7e 100755
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -5,6 +5,7 @@ GetSources () {
   # This list needs to be kept in sync w/ the one in dygraph-dev.js
   # and the one in jsTestDriver.conf. Order matters, except for the plugins.
   for F in \
+    polyfills/console.js \
     dashed-canvas.js \
     dygraph-options.js \
     dygraph-layout.js \
@@ -37,13 +38,14 @@ CatSources () {
 }
 
 Copyright () {
-  echo '/*! @license Copyright 2011 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
+  echo '/*! @license Copyright 2014 Dan Vanderkam (danvdk@gmail.com) MIT-licensed (http://opensource.org/licenses/MIT) */'
 }
 
 CatCompressed () {
   Copyright
   CatSources \
-  | java -jar yuicompressor-2.4.2.jar --type js
+  | grep -v '"use strict";' \
+  | node_modules/uglify-js/bin/uglifyjs -c warnings=false -m
 }
 
 ACTION="${1:-update}"