Merge pull request #309 from hulkholden/hidpi

[dygraphs.git] / generate-combined.sh

diff --git a/generate-combined.sh b/generate-combined.sh
index 09f316f..7cdc22a 100755 (executable)
--- a/generate-combined.sh
+++ b/generate-combined.sh
@@ -5,9 +5,6 @@ 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 \
-    strftime/strftime-min.js \
-    rgbcolor/rgbcolor.js \
-    stacktrace.js \
     dashed-canvas.js \
     dygraph-options.js \
     dygraph-layout.js \
@@ -40,13 +37,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}"