Bug 1203159 - Update each product's DevTools inclusion. r=glandium,ochameau draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 14 Oct 2015 17:03:41 -0500
changeset 300904 b6b03bd71d0690c73e2e1c99c9aa84a650023277
parent 300903 3c1ca11f1096372a975ec99b52c1945fe7f68a8b
child 300905 4284e3ec87360aaa2b240de2b767de5daf5ab2f0
push id6373
push userjryans@gmail.com
push dateWed, 14 Oct 2015 22:21:03 +0000
reviewersglandium, ochameau
bugs1203159
milestone44.0a1
Bug 1203159 - Update each product's DevTools inclusion. r=glandium,ochameau Applications that want any part of DevTools must now include it explicitly, so that DIST_SUBDIR is in effect for all DevTools files if it is used by the app.
b2g/app.mozbuild
browser/moz.build
devtools/moz.build
mobile/android/app.mozbuild
toolkit/toolkit.mozbuild
--- a/b2g/app.mozbuild
+++ b/b2g/app.mozbuild
@@ -9,9 +9,11 @@ elif CONFIG['ENABLE_TESTS']:
     DIRS += ['/testing/mochitest']
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/b2g',
+    '/devtools/server',
+    '/devtools/shared',
 ]
--- a/browser/moz.build
+++ b/browser/moz.build
@@ -12,17 +12,17 @@ DIRS += [
     'base',
     'components',
     'experiments',
     'fuel',
     'locales',
     'modules',
     'themes',
     'extensions',
-    '/devtools/client',
+    '/devtools',
 ]
 
 DIRS += [
     'app',
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
new file mode 100644
--- /dev/null
+++ b/devtools/moz.build
@@ -0,0 +1,11 @@
+# -*- Mode: python; c-basic-offset: 4; 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 += [
+    'client',
+    'server',
+    'shared',
+]
--- a/mobile/android/app.mozbuild
+++ b/mobile/android/app.mozbuild
@@ -13,9 +13,11 @@ if CONFIG['ENABLE_TESTS']:
     DIRS += ['/testing/instrumentation']
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/mobile/android',
+    '/devtools/server',
+    '/devtools/shared',
 ]
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -138,18 +138,16 @@ DIRS += [
     '/security/manager',
     '/toolkit',
 ]
 
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     DIRS += ['/extensions/pref']
 
 DIRS += [
-    '/devtools/server',
-    '/devtools/shared',
     '/services',
     '/startupcache',
     '/js/ductwork/debugger',
     '/other-licenses/snappy',
 ]
 
 if CONFIG['MOZ_GIO_COMPONENT']:
     DIRS += ['/extensions/gio']