Bug 1131499 - merge pull request #28250 from RickyChien:clean-stage-a…

…pp-nodejs to mozilla-b2g:master

Makefile

@@ -72,11 +72,7 @@ ifdef LOCALES_FILE
 	REBUILD=1
 endif
 
-# Switching XPCShell/Node.js build runner
 BUILD_RUNNER=run-js-command
-ifeq ($(RUN_ON_NODE), 1)
-BUILD_RUNNER=run-node-command
-endif
 
 -include local.mk
 

build/clean-stage-app.js

@@ -1,8 +1,6 @@
 'use strict';
 
-/* global require, exports */
-
-var utils = require('utils');
+var utils = require('./utils');
 
 function remove(stageDir, appName) {
   var stageAppDir = utils.getFile(stageDir, appName);

build/common.mk

@@ -24,7 +24,5 @@ define run-js-command
 endef
 
 define run-node-command
-  echo "run-node-command $1";
-  node --harmony -e \
-  "require('./build/$(strip $1).js').execute($(BUILD_CONFIG))"
+  node --harmony -e "require('./build/$(strip $1).js').execute($(BUILD_CONFIG))"
 endef

build/pre-app.js

@@ -1,9 +1,10 @@
 'use strict';
 
-/* global require, exports */
+var utils = require('utils');
+var nodeHelper = new utils.NodeHelper();
 
 function execute(options) {
-  require('./clean-stage-app').execute(options);
+  nodeHelper.require('clean-stage-app', options);
 
   require('./svoperapps').execute(options);
 
@@ -29,4 +30,5 @@ function execute(options) {
   // Copy common files such as webapps.json
   require('./copy-common-files').execute(options);
 }
+
 exports.execute = execute;

build/utils-node.js

@@ -10,8 +10,6 @@
  * which contains the complete functions used in 'utils.js'
  */
 
-/* jshint node: true */
-
 var utils = require('./utils.js');
 var path = require('path');
 var childProcess = require('child_process');
@@ -69,10 +67,10 @@ module.exports = {
     }
     return {
       exists: function() {
-        return fs.accessSync(src);
+        return fs.existsSync(src);
       },
       remove: function() {
-        fs.remove(src);
+        fs.removeSync(src);
       },
       isDirectory: function() {
         return !!fileStat && fileStat.isDirectory();

build/utils-xpc.js

@@ -1,7 +1,7 @@
 'use strict';
 
-/* global require, Services, dump, FileUtils, exports, OS, Promise, Reflect */
-/* jshint -W079, -W118 */
+/* global Services, dump, FileUtils, OS */
+/* jshint -W118 */
 
 const { Cc, Ci, Cr, Cu, CC } = require('chrome');
 
@@ -940,7 +940,6 @@ function Commander(cmd) {
     var process = Cc['@mozilla.org/process/util;1']
                   .createInstance(Ci.nsIProcess);
     try {
-      log('cmd', command + ' ' + args.join(' '));
       process.init(_file);
       process.run(true, args, args.length);
       callback && callback(process.exitValue);
@@ -1241,15 +1240,24 @@ var scriptLoader = {
   }
 };
 
-var requireNode = function() {
-  var node = new Commander('node');
-  node.initPath(getEnvPath());
-
-  this.run = function(path) {
-    node.run(['--harmony', '-e', 'require("./build/' + path + '").execute(' +
-      getEnv('BUILD_CONFIG') + ')']);
-  };
-};
+/**
+ * Run specific build task on Node.js if RUN_ON_NODE is on, otherwise we go back
+ * to XPCShell.
+ */
+function NodeHelper(path) {
+  if (getEnv('RUN_ON_NODE') === '1') {
+    var node = new Commander('node');
+    node.initPath(getEnvPath());
+    this.require = function(path, options) {
+      node.run(['--harmony', '-e', 'require("./build/' + path + '").execute(' +
+        JSON.stringify(options) + ')']);
+    };
+  } else {
+    this.require = function(path, options) {
+      require(path).execute(options);
+    };
+  }
+}
 
 exports.Q = Promise;
 exports.ls = ls;
@@ -1277,8 +1285,6 @@ exports.generateUUID = generateUUID;
 exports.copyRec = copyRec;
 exports.createZip = createZip;
 exports.scriptParser = Reflect.parse;
-exports.requireNode = requireNode;
-// ===== the following functions support node.js compitable interface.
 exports.deleteFile = deleteFile;
 exports.listFiles = listFiles;
 exports.fileExists = fileExists;
@@ -1311,3 +1317,4 @@ exports.getCompression = getCompression;
 exports.existsInAppDirs = existsInAppDirs;
 exports.removeFiles = removeFiles;
 exports.scriptLoader = scriptLoader;
+exports.NodeHelper = NodeHelper;

build/utils.js

@@ -1,10 +1,10 @@
+'use strict';
+
 /**
  * This file exports all 'utils' functions, which indeed exports the
  * implementations inside the 'utils-node' and 'utils-xpc' files.
  */
 
-'use strict';
-/* global exports, require, process*/
 const FILE_TYPE_FILE = 0;
 const FILE_TYPE_DIRECTORY = 1;
 
@@ -361,4 +361,4 @@ exports.getAppNameRegex = getAppNameRegex;
 exports.serializeDocument = serializeDocument;
 exports.cloneJSON = cloneJSON;
 exports.jsComparator = jsComparator;
-exports.requireNode = utils.requireNode;
+exports.NodeHelper = utils.NodeHelper;