Backed out changeset 082ece5eba4d (bug 1369801)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 27 Jul 2017 18:14:03 +0200
changeset 420070 952d7e686b62e994ca019028b0eac1281fff4990
parent 420069 ce6144ec89d2d2e0cd1c6e64bc05a0ddd0c54ab4
child 420071 68ab4d2e7d854952b2df2ac38d43bf3c18687588
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1369801
milestone56.0a1
backs out082ece5eba4d5005058a7c8e1b11d8cbe5e3061f
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
Backed out changeset 082ece5eba4d (bug 1369801) MozReview-Commit-ID: LinIFYwj1fW
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
rename from devtools/shim/devtools-startup.js
rename to devtools/client/devtools-startup.js
rename from devtools/shim/devtools-startup.manifest
rename to devtools/client/devtools-startup.manifest
--- a/devtools/client/moz.build
+++ b/devtools/client/moz.build
@@ -34,16 +34,21 @@ 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('**'):
--- a/devtools/shim/moz.build
+++ b/devtools/shim/moz.build
@@ -1,21 +1,16 @@
 # -*- 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',