Bug 1369801 - dt-addon: move devtools-startup to devtools shim folder r=ochameau
authorJulian Descottes <jdescottes@mozilla.com>
Thu, 20 Jul 2017 18:56:39 +0200
changeset 422276 082ece5eba4d5005058a7c8e1b11d8cbe5e3061f
parent 422275 0462e7a66185a233fe9cbd389c9ca45a7e860565
child 422277 71b891583296678bceb312953e7fd5b1c3bec2d7
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1369801
milestone56.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 1369801 - dt-addon: move devtools-startup to devtools shim folder r=ochameau MozReview-Commit-ID: GNFAyfXHIa9
devtools/client/devtools-startup.js
devtools/client/devtools-startup.manifest
devtools/client/moz.build
devtools/shim/devtools-startup.js
devtools/shim/devtools-startup.manifest
devtools/shim/moz.build
--- a/devtools/client/moz.build
+++ b/devtools/client/moz.build
@@ -34,21 +34,16 @@ DIRS += [
     'webconsole',
     'webide',
 ]
 
 # Shim old theme paths used by DevTools add-ons
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DIRS += ['themes/shims']
 
-EXTRA_COMPONENTS += [
-    'devtools-startup.js',
-    'devtools-startup.manifest',
-]
-
 JAR_MANIFESTS += ['jar.mn']
 
 DevToolsModules(
     'definitions.js',
     'menus.js',
 )
 
 with Files('**'):
rename from devtools/client/devtools-startup.js
rename to devtools/shim/devtools-startup.js
rename from devtools/client/devtools-startup.manifest
rename to devtools/shim/devtools-startup.manifest
--- a/devtools/shim/moz.build
+++ b/devtools/shim/moz.build
@@ -1,16 +1,21 @@
 # -*- 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/.
 
 JAR_MANIFESTS += ['jar.mn']
 
+EXTRA_COMPONENTS += [
+    'devtools-startup.js',
+    'devtools-startup.manifest',
+]
+
 JS_PREFERENCE_PP_FILES += [
     'devtools-startup-prefs.js',
 ]
 
 # Register the about:debugging page only for 'addon' and 'all' builds.
 if CONFIG['MOZ_DEVTOOLS'] != 'server':
     EXTRA_COMPONENTS += [
         'aboutdebugging-registration.js',