From 140dd0f15b27e95405507c6167f0e4883628b59a Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 28 Apr 2017 12:47:20 -0500
Subject: [PATCH] Removes builder.build().

---
 external/builder/builder.js | 41 -------------------------------------
 gulpfile.js                 | 30 +++------------------------
 2 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/external/builder/builder.js b/external/builder/builder.js
index 8ee87e0b3..91cc89c98 100644
--- a/external/builder/builder.js
+++ b/external/builder/builder.js
@@ -265,47 +265,6 @@ function preprocessCSS(mode, source, destination) {
 }
 exports.preprocessCSS = preprocessCSS;
 
-/**
- * Simplifies common build steps.
- * @param {object} setup
- *        .defines defines for preprocessors
- *        .copy array of arrays of source and destination pairs of files to copy
- *        .preprocess array of arrays of source and destination pairs of files
- *                    run through preprocessor.
- */
-function build(setup) {
-  var defines = setup.defines;
-
-  setup.copy.forEach(function(option) {
-    var source = option[0];
-    var destination = option[1];
-    cp('-R', source, destination);
-  });
-
-  setup.preprocess.forEach(function(option) {
-    var sources = option[0];
-    var destination = option[1];
-
-    sources = ls('-R', sources);
-    sources.forEach(function(source) {
-      // ??? Warn if the source is wildcard and dest is file?
-      var destWithFolder = destination;
-      if (test('-d', destination)) {
-        destWithFolder += '/' + path.basename(source);
-      }
-      preprocess(source, destWithFolder, defines);
-    });
-  });
-
-  (setup.preprocessCSS || []).forEach(function(option) {
-    var mode = option[0];
-    var source = option[1];
-    var destination = option[2];
-    preprocessCSS(mode, source, destination);
-  });
-}
-exports.build = build;
-
 /**
  * Merge two defines arrays. Values in the second param will override values in
  * the first.
diff --git a/gulpfile.js b/gulpfile.js
index 98c094785..1edd8d963 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -527,15 +527,7 @@ gulp.task('bundle', ['buildnumber'], function () {
 
 function preprocessCSS(source, mode, defines, cleanup) {
   var outName = getTempFile('~preprocess', '.css');
-  var setup = {
-    defines: defines,
-    copy: [],
-    preprocess: [],
-    preprocessCSS: [
-      [mode, source, outName]
-    ]
-  };
-  builder.build(setup);
+  builder.preprocessCSS(mode, source, outName);
   var out = fs.readFileSync(outName).toString();
   fs.unlinkSync(outName);
   if (cleanup) {
@@ -550,15 +542,7 @@ function preprocessCSS(source, mode, defines, cleanup) {
 
 function preprocessHTML(source, defines) {
   var outName = getTempFile('~preprocess', '.html');
-  var setup = {
-    defines: defines,
-    copy: [],
-    preprocess: [
-      [source, outName]
-    ],
-    preprocessCSS: []
-  };
-  builder.build(setup);
+  builder.preprocess(source, outName, defines);
   var out = fs.readFileSync(outName).toString();
   fs.unlinkSync(outName);
 
@@ -568,15 +552,7 @@ function preprocessHTML(source, defines) {
 
 function preprocessJS(source, defines, cleanup) {
   var outName = getTempFile('~preprocess', '.js');
-  var setup = {
-    defines: defines,
-    copy: [],
-    preprocess: [
-      [source, outName]
-    ],
-    preprocessCSS: []
-  };
-  builder.build(setup);
+  builder.preprocess(source, outName, defines);
   var out = fs.readFileSync(outName).toString();
   fs.unlinkSync(outName);
   if (cleanup) {