Bug 1160361 - Move commands-index to the server. r=bgrins
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 06 May 2015 12:34:27 -0500
changeset 272480 2a20b3052ed7e2b5ce3c905ebba0bc597f76aa14
parent 272479 32df49355c68a1475bb490c671957daba20e253b
child 272481 e92ab4bd581c9aa8884ac1f8d98bec0b7286e0a5
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1160361
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1160361 - Move commands-index to the server. r=bgrins
browser/devtools/commandline/commands-index.js
browser/devtools/commandline/moz.build
browser/devtools/commandline/test/browser_cmd_settings.js
browser/devtools/jar.mn
browser/devtools/shared/DeveloperToolbar.jsm
toolkit/devtools/gcli/commands/index.js
toolkit/devtools/gcli/moz.build
toolkit/devtools/server/actors/gcli.js
--- a/browser/devtools/commandline/moz.build
+++ b/browser/devtools/commandline/moz.build
@@ -1,9 +1,5 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXTRA_JS_MODULES.devtools.commandline += [
-    'commands-index.js'
-]
-
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
--- a/browser/devtools/commandline/test/browser_cmd_settings.js
+++ b/browser/devtools/commandline/test/browser_cmd_settings.js
@@ -18,17 +18,17 @@ function test() {
 
 function* spawnTest() {
   // Setup
   let options = yield helpers.openTab(TEST_URI);
 
   const { createSystem } = require("gcli/system");
   const system = createSystem({ location: "server" });
 
-  const gcliInit = require("devtools/commandline/commands-index");
+  const gcliInit = require("gcli/commands/index");
   gcliInit.addAllItemsByModule(system);
   yield system.load();
 
   let settings = system.settings;
 
   let hideIntroEnabled = settings.get("devtools.gcli.hideIntro");
   let tabSize = settings.get("devtools.editor.tabsize");
   let remoteHost = settings.get("devtools.debugger.remote-host");
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -112,17 +112,16 @@ browser.jar:
     content/browser/devtools/performance/views/details-memory-call-tree.js  (performance/views/details-memory-call-tree.js)
     content/browser/devtools/performance/views/details-memory-flamegraph.js (performance/views/details-memory-flamegraph.js)
     content/browser/devtools/performance/views/recordings.js           (performance/views/recordings.js)
     content/browser/devtools/performance/views/jit-optimizations.js    (performance/views/jit-optimizations.js)
     content/browser/devtools/responsivedesign/resize-commands.js       (responsivedesign/resize-commands.js)
     content/browser/devtools/commandline.css                           (commandline/commandline.css)
     content/browser/devtools/commandlineoutput.xhtml                   (commandline/commandlineoutput.xhtml)
     content/browser/devtools/commandlinetooltip.xhtml                  (commandline/commandlinetooltip.xhtml)
-    content/browser/devtools/commandline/commands-index.js             (commandline/commands-index.js)
 *   content/browser/devtools/framework/toolbox-window.xul              (framework/toolbox-window.xul)
     content/browser/devtools/framework/toolbox-options.xul             (framework/toolbox-options.xul)
     content/browser/devtools/framework/toolbox-options.js              (framework/toolbox-options.js)
     content/browser/devtools/framework/toolbox.xul                     (framework/toolbox.xul)
     content/browser/devtools/framework/options-panel.css               (framework/options-panel.css)
     content/browser/devtools/framework/toolbox-process-window.xul      (framework/toolbox-process-window.xul)
 *   content/browser/devtools/framework/toolbox-process-window.js       (framework/toolbox-process-window.js)
     content/browser/devtools/framework/dev-edition-promo.xul           (framework/dev-edition-promo/dev-edition-promo.xul)
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -36,17 +36,17 @@ XPCOMUtils.defineLazyGetter(this, "prefB
 XPCOMUtils.defineLazyGetter(this, "toolboxStrings", function () {
   return Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties");
 });
 
 const Telemetry = require("devtools/shared/telemetry");
 
 XPCOMUtils.defineLazyGetter(this, "gcliInit", function() {
   try {
-    return require("devtools/commandline/commands-index");
+    return require("gcli/commands/index");
   }
   catch (ex) {
     console.log(ex);
   }
 });
 
 XPCOMUtils.defineLazyGetter(this, "util", () => {
   return require("gcli/util/util");
rename from browser/devtools/commandline/commands-index.js
rename to toolkit/devtools/gcli/commands/index.js
--- a/toolkit/devtools/gcli/moz.build
+++ b/toolkit/devtools/gcli/moz.build
@@ -8,16 +8,17 @@ EXTRA_JS_MODULES.devtools.gcli.commands 
     'commands/addon.js',
     'commands/appcache.js',
     'commands/calllog.js',
     'commands/cmd.js',
     'commands/cookie.js',
     'commands/csscoverage.js',
     'commands/folder.js',
     'commands/highlight.js',
+    'commands/index.js',
     'commands/inject.js',
     'commands/jsb.js',
     'commands/listen.js',
     'commands/media.js',
     'commands/pagemod.js',
     'commands/paintflashing.js',
     'commands/restart.js',
     'commands/rulers.js',
--- a/toolkit/devtools/server/actors/gcli.js
+++ b/toolkit/devtools/server/actors/gcli.js
@@ -239,17 +239,17 @@ const GcliActor = ActorClass({
     }
 
     const Requisition = require("gcli/cli").Requisition;
     const tabActor = this._tabActor;
 
     this._system = createSystem({ location: "server" });
     this._system.commands.onCommandsChange.add(this._commandsChanged);
 
-    const gcliInit = require("devtools/commandline/commands-index");
+    const gcliInit = require("gcli/commands/index");
     gcliInit.addAllItemsByModule(this._system);
 
     // this._requisitionPromise should be created synchronously with the call
     // to _getRequisition so that destroy can tell whether there is an async
     // init in progress
     this._requisitionPromise = this._system.load().then(() => {
       const environment = {
         get chromeWindow() {
@@ -277,17 +277,17 @@ const GcliActor = ActorClass({
   _commandsChanged: function() {
     events.emit(this, "commands-changed");
   },
 });
 
 exports.GcliActor = GcliActor;
 
 /**
- * 
+ *
  */
 const GcliFront = exports.GcliFront = FrontClass(GcliActor, {
   initialize: function(client, tabForm) {
     Front.prototype.initialize.call(this, client);
     this.actorID = tabForm.gcliActor;
 
     // XXX: This is the first actor type in its hierarchy to use the protocol
     // library, so we're going to self-own on the client side for now.