New build system working for safari

greneholt · Sep 21, 2013 · d243c45 · d243c45
1 parent 088856f
commit d243c45
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/build.coffee b/build.coffee
@@ -16,21 +16,10 @@ if task == 'safari'
     (cb) ->
       async.parallel [
         (cb) ->
-          b.concat [
-              'src/util.js'
-              'safari/inject.coffee'
-              'src/player.js'
-              'src/inject.js'
-            ]
-          , 'build/YouTube5.safariextension/inject.js', cb
+          b.concat '{src/{util,player,inject}.js,safari/inject.coffee}', 'build/YouTube5.safariextension/inject.js', cb
 
         (cb) ->
-          b.concat [
-            'src/util.js'
-            'src/main.js'
-            'safari/main.coffee'
-          ]
-          , 'build/YouTube5.safariextension/main.js', cb
+          b.concat '{src/{util,main,providers/*}.js,safari/main.coffee}', 'build/YouTube5.safariextension/main.js', cb
 
         (cb) ->
           b.globCopy 'assets/*', 'build/YouTube5.safariextension', cb

diff --git a/buildutils.coffee b/buildutils.coffee
@@ -10,18 +10,20 @@ path = require 'path'
 
 module.exports = utils = {}
 
-utils.concat = (fileList, dest, callback) ->
-  async.map fileList, (filePath, cb) ->
-    fs.readFile filePath, FILE_ENCODING, (err, src) ->
-      return cb err if err
-      src = coffee.compile src, {bare: yes} if coffee.helpers.isCoffee(filePath)
-      cb null, src
-  , (err, fileContents) ->
+utils.concat = (pattern, dest, callback) ->
+  glob pattern, (err, matches) ->
     return callback err if err
-    fs.writeFile dest, fileContents.join(EOL), FILE_ENCODING, (err) ->
+    async.map matches, (filePath, cb) ->
+      fs.readFile filePath, FILE_ENCODING, (err, src) ->
+        return cb err if err
+        src = coffee.compile src, {bare: yes} if coffee.helpers.isCoffee(filePath)
+        cb null, src
+    , (err, fileContents) ->
       return callback err if err
-      console.log "Built #{dest}"
-      callback()
+      fs.writeFile dest, fileContents.join(EOL), FILE_ENCODING, (err) ->
+        return callback err if err
+        console.log "Concat #{matches.join(', ')} -> #{dest}"
+        callback()
 
 utils.globCopy = (pattern, destDir, callback) ->
   glob pattern, (err, matches) ->

diff --git a/safari/global.html b/safari/global.html
@@ -1,7 +1,3 @@
 <!DOCTYPE html><html><head><title>YouTube5</title>
-<script type="text/javascript" src="util.js"></script>
-<script type="text/javascript" src="main.js"></script>
-<script type="text/javascript" src="providers/youtube.js"></script>
-<script type="text/javascript" src="providers/vimeo.js"></script>
-<script type="text/javascript" src="providers/facebook.js"></script>
+<script type="text/javascript" src="main.js"></script>2
 </head><body></body></html>