Bug 1188417 - Split gcli commands require path to match file system. r=jwalker

browser/devtools/commandline/test/browser_cmd_highlight_02.js

@@ -36,7 +36,7 @@ function test() {
 function getHighlighterNumber() {
   // Note that this only works as long as gcli tests aren't run with e10s on.
   // To make this e10s ready, execute this in a content frame script instead.
-  return require("gcli/commands/highlight").highlighters.length;
+  return require("devtools/toolkit/gcli/commands/highlight").highlighters.length;
 }
 
 function* runCommand(cmd, options) {

browser/devtools/commandline/test/browser_cmd_settings.js

@@ -23,7 +23,7 @@ function* spawnTest() {
   const { createSystem } = require("gcli/system");
   const system = createSystem({ location: "server" });
 
-  const gcliInit = require("gcli/commands/index");
+  const gcliInit = require("devtools/toolkit/gcli/commands/index");
   gcliInit.addAllItemsByModule(system);
   yield system.load();
 

browser/devtools/shared/DeveloperToolbar.jsm

@@ -41,7 +41,7 @@ const Telemetry = require("devtools/shared/telemetry");
 
 XPCOMUtils.defineLazyGetter(this, "gcliInit", function() {
   try {
-    return require("gcli/commands/index");
+    return require("devtools/toolkit/gcli/commands/index");
   }
   catch (ex) {
     console.log(ex);

toolkit/devtools/gcli/commands/index.js

@@ -54,25 +54,25 @@ exports.baseModules = [
  * modules that are *not* owned by a tool.
  */
 exports.devtoolsModules = [
-  "gcli/commands/addon",
-  "gcli/commands/appcache",
-  "gcli/commands/calllog",
-  "gcli/commands/cmd",
-  "gcli/commands/cookie",
-  "gcli/commands/csscoverage",
-  "gcli/commands/folder",
-  "gcli/commands/highlight",
-  "gcli/commands/inject",
-  "gcli/commands/jsb",
-  "gcli/commands/listen",
-  "gcli/commands/media",
-  "gcli/commands/pagemod",
-  "gcli/commands/paintflashing",
-  "gcli/commands/restart",
-  "gcli/commands/rulers",
-  "gcli/commands/screenshot",
-  "gcli/commands/security",
-  "gcli/commands/tools",
+  "devtools/toolkit/gcli/commands/addon",
+  "devtools/toolkit/gcli/commands/appcache",
+  "devtools/toolkit/gcli/commands/calllog",
+  "devtools/toolkit/gcli/commands/cmd",
+  "devtools/toolkit/gcli/commands/cookie",
+  "devtools/toolkit/gcli/commands/csscoverage",
+  "devtools/toolkit/gcli/commands/folder",
+  "devtools/toolkit/gcli/commands/highlight",
+  "devtools/toolkit/gcli/commands/inject",
+  "devtools/toolkit/gcli/commands/jsb",
+  "devtools/toolkit/gcli/commands/listen",
+  "devtools/toolkit/gcli/commands/media",
+  "devtools/toolkit/gcli/commands/pagemod",
+  "devtools/toolkit/gcli/commands/paintflashing",
+  "devtools/toolkit/gcli/commands/restart",
+  "devtools/toolkit/gcli/commands/rulers",
+  "devtools/toolkit/gcli/commands/screenshot",
+  "devtools/toolkit/gcli/commands/security",
+  "devtools/toolkit/gcli/commands/tools",
 ];
 
 /**
@@ -111,7 +111,7 @@ exports.addAllItemsByModule = function(system) {
   system.addItemsByModule(exports.devtoolsToolModules, { delayedLoad: true });
   system.addItemsByModule(exports.devtoolsButtonModules, { delayedLoad: true });
 
-  const { mozDirLoader } = require("gcli/commands/cmd");
+  const { mozDirLoader } = require("devtools/toolkit/gcli/commands/cmd");
   system.addItemsByModule("mozcmd", { delayedLoad: true, loader: mozDirLoader });
 };
 

toolkit/devtools/server/actors/gcli.js

@@ -244,7 +244,7 @@ const GcliActor = ActorClass({
     this._system = createSystem({ location: "server" });
     this._system.commands.onCommandsChange.add(this._commandsChanged);
 
-    const gcliInit = require("gcli/commands/index");
+    const gcliInit = require("devtools/toolkit/gcli/commands/index");
     gcliInit.addAllItemsByModule(this._system);
 
     // this._requisitionPromise should be created synchronously with the call