Bug 1203159 - Update shim install locations. r=glandium,ochameau
authorJ. Ryan Stinnett <jryans@gmail.com>
Tue, 13 Oct 2015 18:51:38 -0500
changeset 303877 6de7cd4e859803d8fe18855c6083fdb6fd48b5cb
parent 303876 397c69fa1677017b7f1ad532958b8a8ea70a2313
child 303878 c5f9c2055402e2e10fafac4f9de33c1de896d54d
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, ochameau
bugs1203159
milestone44.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 1203159 - Update shim install locations. r=glandium,ochameau Add more shim paths for JSM locations used during the 44 cycle for add-ons that already migrated. Also, clear any DIST_SUBDIR value for the shim directory only to ensure the old paths are reachable.
devtools/client/shims/moz.build
devtools/server/shims/moz.build
devtools/shared/shims/moz.build
--- a/devtools/client/shims/moz.build
+++ b/devtools/client/shims/moz.build
@@ -6,8 +6,13 @@
 
 # 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_JS_MODULES.devtools += [
     'gDevTools.jsm',
 ]
+
+# Extra compatibility layer for transitional URLs used for part of 44 cycle
+EXTRA_JS_MODULES.devtools.client.framework += [
+    'gDevTools.jsm',
+]
--- a/devtools/server/shims/moz.build
+++ b/devtools/server/shims/moz.build
@@ -3,11 +3,15 @@
 # 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',
 ]
--- a/devtools/shared/shims/moz.build
+++ b/devtools/shared/shims/moz.build
@@ -3,20 +3,29 @@
 # 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 += [
     'Console.jsm',
     'dbg-client.jsm',
     'event-emitter.js',
     'Loader.jsm',
     'Simulator.jsm',
 ]
 
-# Extra compatibility layer for transitional URL used in middle of fx44 cycle
+# Extra compatibility layer for transitional URLs used for part of 44 cycle
 EXTRA_JS_MODULES.devtools.shared += [
     'Console.jsm',
+    'Loader.jsm',
 ]
+
+EXTRA_JS_MODULES.devtools.shared.apps += [
+    'Simulator.jsm',
+]