X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=generate-combined.sh;h=7cdc22aebf13aa017eb4c2d9280962fbfa6fe4c2;hb=2f0791e360541554b8e8bbdf8c7f75084838f615;hp=9e184ae5833a3434cb3977f48806de82579ec716;hpb=90ccd1c3393245e04a64a849e4c4e9f3e2d73c05;p=dygraphs.git

diff --git a/generate-combined.sh b/generate-combined.sh
index 9e184ae..7cdc22a 100755
--- 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 \
@@ -19,7 +16,14 @@ GetSources () {
     dygraph-tickers.js \
     dygraph-plugin-base.js \
     plugins/*.js \
-    dygraph-plugin-install.js
+    dygraph-plugin-install.js \
+    datahandler/datahandler.js \
+    datahandler/default.js \
+    datahandler/default-fractions.js \
+    datahandler/bars.js \
+    datahandler/bars-custom.js \
+    datahandler/bars-error.js \
+    datahandler/bars-fractions.js 
   do
       echo "$F"
   done
@@ -33,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}"