Bug 776518 - Move Require.jsm somewhere into toolkit to fix comm-central's busted XPCShell tests; r=rcampbell
authorMichael Ratcliffe <mratcliffe@mozilla.com>
Tue, 24 Jul 2012 12:08:30 +0100
changeset 100412 35bc0dd4080cb2cab3541fab6dc392ce1b4c84b1
parent 100299 34b14c220817411ad33df81c5018521e5a3f4006
child 100413 c7c9c6e428d3ebb8f489d10c604d6ad8653000e8
child 100414 40bfa9aa4ab01beba1459736f7c82a35e5f30413
push id12484
push userMs2ger@gmail.com
push dateWed, 25 Jul 2012 14:52:21 +0000
treeherdermozilla-inbound@add804e00991 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrcampbell
bugs776518
milestone17.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 776518 - Move Require.jsm somewhere into toolkit to fix comm-central's busted XPCShell tests; r=rcampbell
browser/devtools/commandline/gcli.jsm
browser/devtools/commandline/test/browser_gcli_integrate.js
browser/devtools/commandline/test/browser_gcli_pref.js
browser/devtools/commandline/test/browser_gcli_settings.js
browser/devtools/commandline/test/browser_gcli_web.js
browser/devtools/shared/Require.jsm
browser/devtools/shared/test/browser_require_basic.js
toolkit/devtools/Makefile.in
toolkit/devtools/Require.jsm
toolkit/devtools/sourcemap/SourceMap.jsm
toolkit/devtools/sourcemap/tests/unit/Utils.jsm
--- a/browser/devtools/commandline/gcli.jsm
+++ b/browser/devtools/commandline/gcli.jsm
@@ -21,17 +21,17 @@
  * This file is generated from separate files stored in the GCLI project.
  * Please modify the files there and use the import script so the 2 projects
  * are kept in sync.
  * For more information, ask Joe Walker <jwalker@mozilla.com>
  */
 
 var EXPORTED_SYMBOLS = [ "gcli" ];
 
-Components.utils.import("resource:///modules/devtools/Require.jsm");
+Components.utils.import("resource://gre/modules/devtools/Require.jsm");
 Components.utils.import("resource:///modules/devtools/Console.jsm");
 Components.utils.import("resource:///modules/devtools/Browser.jsm");
 
 /*
  * Copyright 2012, Mozilla Foundation and contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
--- a/browser/devtools/commandline/test/browser_gcli_integrate.js
+++ b/browser/devtools/commandline/test/browser_gcli_integrate.js
@@ -6,17 +6,17 @@
 
 function test() {
   testCreateCommands();
   testRemoveCommands();
 }
 
 let [ define, require ] = (function() {
   let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Require.jsm", tempScope);
+  Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
   return [ tempScope.define, tempScope.require ];
 })();
 
 registerCleanupFunction(function tearDown() {
   define = undefined;
   require = undefined;
 });
 
--- a/browser/devtools/commandline/test/browser_gcli_pref.js
+++ b/browser/devtools/commandline/test/browser_gcli_pref.js
@@ -37,17 +37,17 @@ function test() {
   });
 }
 
 let tiltEnabledOrig = undefined;
 let tabSizeOrig = undefined;
 let remoteHostOrig = undefined;
 
 function setup() {
-  Components.utils.import("resource:///modules/devtools/Require.jsm", imports);
+  Components.utils.import("resource://gre/modules/devtools/Require.jsm", imports);
   imports.settings = imports.require("gcli/settings");
 
   tiltEnabledOrig = imports.prefBranch.getBoolPref("devtools.tilt.enabled");
   tabSizeOrig = imports.prefBranch.getIntPref("devtools.editor.tabsize");
   remoteHostOrig = imports.prefBranch.getComplexValue(
           "devtools.debugger.remote-host",
           Components.interfaces.nsISupportsString).data;
 
--- a/browser/devtools/commandline/test/browser_gcli_settings.js
+++ b/browser/devtools/commandline/test/browser_gcli_settings.js
@@ -36,17 +36,17 @@ let tiltEnabled = undefined;
 let tabSize = undefined;
 let remoteHost = undefined;
 
 let tiltEnabledOrig = undefined;
 let tabSizeOrig = undefined;
 let remoteHostOrig = undefined;
 
 function setup() {
-  Components.utils.import("resource:///modules/devtools/Require.jsm", imports);
+  Components.utils.import("resource://gre/modules/devtools/Require.jsm", imports);
   imports.settings = imports.require("gcli/settings");
 
   tiltEnabled = imports.settings.getSetting("devtools.tilt.enabled");
   tabSize = imports.settings.getSetting("devtools.editor.tabsize");
   remoteHost = imports.settings.getSetting("devtools.debugger.remote-host");
 
   tiltEnabledOrig = imports.prefBranch.getBoolPref("devtools.tilt.enabled");
   tabSizeOrig = imports.prefBranch.getIntPref("devtools.editor.tabsize");
--- a/browser/devtools/commandline/test/browser_gcli_web.js
+++ b/browser/devtools/commandline/test/browser_gcli_web.js
@@ -49,17 +49,17 @@
  *
  *
  */
 
 ///////////////////////////////////////////////////////////////////////////////
 
 let [ define, require ] = (function() {
   let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Require.jsm", tempScope);
+  Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
   return [ tempScope.define, tempScope.require ];
 })();
 
 let console = (function() {
   let tempScope = {};
   Components.utils.import("resource:///modules/devtools/Console.jsm", tempScope);
   return console;
 })();
--- a/browser/devtools/shared/test/browser_require_basic.js
+++ b/browser/devtools/shared/test/browser_require_basic.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that source URLs in the Web Console can be clicked to display the
 // standard View Source window.
 
 let [ define, require ] = (function() {
   let tempScope = {};
-  Components.utils.import("resource:///modules/devtools/Require.jsm", tempScope);
+  Components.utils.import("resource://gre/modules/devtools/Require.jsm", tempScope);
   return [ tempScope.define, tempScope.require ];
 })();
 
 function test() {
   addTab("about:blank", function() {
     info("Starting Require Tests");
     setup();
 
--- a/toolkit/devtools/Makefile.in
+++ b/toolkit/devtools/Makefile.in
@@ -9,9 +9,13 @@ VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 PARALLEL_DIRS += \
   debugger \
   sourcemap \
   $(NULL)
 
+EXTRA_JS_MODULES = \
+  Require.jsm \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
rename from browser/devtools/shared/Require.jsm
rename to toolkit/devtools/Require.jsm
--- a/toolkit/devtools/sourcemap/SourceMap.jsm
+++ b/toolkit/devtools/sourcemap/SourceMap.jsm
@@ -12,17 +12,17 @@
  * https://github.com/mozilla/source-map/
  */
 
 ///////////////////////////////////////////////////////////////////////////////
 
 
 var EXPORTED_SYMBOLS = [ "SourceMapConsumer", "SourceMapGenerator", "SourceNode" ];
 
-Components.utils.import('resource:///modules/devtools/Require.jsm');
+Components.utils.import('resource://gre/modules/devtools/Require.jsm');
 /* -*- Mode: js; js-indent-level: 2; -*- */
 /*
  * Copyright 2011 Mozilla Foundation and contributors
  * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
 define('source-map/source-map-consumer', ['require', 'exports', 'module' , 'source-map/util', 'source-map/binary-search', 'source-map/array-set', 'source-map/base64-vlq'], function(require, exports, module) {
 
--- a/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
+++ b/toolkit/devtools/sourcemap/tests/unit/Utils.jsm
@@ -7,17 +7,17 @@
 
 /*
  * WARNING!
  *
  * Do not edit this file directly, it is built from the sources at
  * https://github.com/mozilla/source-map/
  */
 
-Components.utils.import('resource:///modules/devtools/Require.jsm');
+Components.utils.import('resource://gre/modules/devtools/Require.jsm');
 Components.utils.import('resource:///modules/devtools/SourceMap.jsm');
 
 let EXPORTED_SYMBOLS = [ "define", "runSourceMapTests" ];
 /* -*- Mode: js; js-indent-level: 2; -*- */
 /*
  * Copyright 2011 Mozilla Foundation and contributors
  * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause