diff options
author | Matt A. Tobin <mattatobin@localhost.localdomain> | 2018-02-02 04:16:08 -0500 |
---|---|---|
committer | Matt A. Tobin <mattatobin@localhost.localdomain> | 2018-02-02 04:16:08 -0500 |
commit | 5f8de423f190bbb79a62f804151bc24824fa32d8 (patch) | |
tree | 10027f336435511475e392454359edea8e25895d /devtools/server/shims | |
parent | 49ee0794b5d912db1f95dce6eb52d781dc210db5 (diff) | |
download | UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.gz UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.lz UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.xz UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.zip |
Add m-esr52 at 52.6.0
Diffstat (limited to 'devtools/server/shims')
-rw-r--r-- | devtools/server/shims/moz.build | 18 | ||||
-rw-r--r-- | devtools/server/shims/protocol.js | 24 | ||||
-rw-r--r-- | devtools/server/shims/toolkit/dbg-server.jsm | 37 | ||||
-rw-r--r-- | devtools/server/shims/toolkit/moz.build | 17 |
4 files changed, 96 insertions, 0 deletions
diff --git a/devtools/server/shims/moz.build b/devtools/server/shims/moz.build new file mode 100644 index 000000000..cebaa79b4 --- /dev/null +++ b/devtools/server/shims/moz.build @@ -0,0 +1,18 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +DIRS += [ + 'toolkit', +] + +# Unlike most DevTools build files, this file does not use DevToolsModules +# because these files are here for add-on compatibility, and so they must be +# installed to previously defined locations. + +# Extra compatibility layer for old path after relocation in bug 1270173 +FINAL_TARGET_FILES.chrome.devtools.modules.devtools.server += [ + 'protocol.js', +] diff --git a/devtools/server/shims/protocol.js b/devtools/server/shims/protocol.js new file mode 100644 index 000000000..34c6f13bb --- /dev/null +++ b/devtools/server/shims/protocol.js @@ -0,0 +1,24 @@ +/* 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/. */ + +"use strict"; + +/** + * This file only exists to support add-ons which import this module at a + * specific path. + */ + +const { Cu } = require("chrome"); +const Services = require("Services"); + +const WARNING_PREF = "devtools.migration.warnings"; +if (Services.prefs.getBoolPref(WARNING_PREF)) { + const { Deprecated } = Cu.import("resource://gre/modules/Deprecated.jsm", {}); + Deprecated.warning("This path to protocol.js is deprecated. Please use " + + "require(\"devtools/shared/protocol\") to load this " + + "module.", + "https://bugzil.la/1270173"); +} + +module.exports = require("devtools/shared/protocol"); diff --git a/devtools/server/shims/toolkit/dbg-server.jsm b/devtools/server/shims/toolkit/dbg-server.jsm new file mode 100644 index 000000000..3114e72dc --- /dev/null +++ b/devtools/server/shims/toolkit/dbg-server.jsm @@ -0,0 +1,37 @@ +/* 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/. */ + +"use strict"; + +/** + * This file only exists to support add-ons which import this module at a + * specific path. + */ + +const Cu = Components.utils; + +const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); + +const WARNING_PREF = "devtools.migration.warnings"; +if (Services.prefs.getBoolPref(WARNING_PREF)) { + const { Deprecated } = Cu.import("resource://gre/modules/Deprecated.jsm", {}); + Deprecated.warning("dbg-server.jsm is deprecated. Please use " + + "require(\"devtools/server/main\") to load this " + + "module.", + "https://bugzil.la/912121"); +} + +this.EXPORTED_SYMBOLS = [ + "DebuggerServer", + "ActorPool", + "OriginalLocation", +]; + +const { require } = + Cu.import("resource://devtools/shared/Loader.jsm", {}); +const module = require("devtools/server/main"); + +for (let symbol of this.EXPORTED_SYMBOLS) { + this[symbol] = module[symbol]; +} diff --git a/devtools/server/shims/toolkit/moz.build b/devtools/server/shims/toolkit/moz.build new file mode 100644 index 000000000..4bfd07f04 --- /dev/null +++ b/devtools/server/shims/toolkit/moz.build @@ -0,0 +1,17 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +# Unlike most DevTools build files, this file does not use DevToolsModules +# because these files are here for add-on compatibility, and so they must be +# installed to previously defined locations. + +# These shims for legacy paths expect to be installed as if they were part of +# /toolkit modules. Disable any DIST_SUBDIR from parent files here. +DIST_SUBDIR = '' + +EXTRA_JS_MODULES.devtools += [ + 'dbg-server.jsm', +] |