Bug 912121 - Adjust build configs and test manifests. r=glandium
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 17 Sep 2015 14:35:36 -0500
changeset 298731 c98255aa4d4b086c66d4e363f2661ac748dc16d8
parent 298730 f3cbe9dd4bb317c60ad515c5ca87b7efc9300100
child 298732 efa64dfee210b9ce08e50b94b4467629a6b554bc
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
bugs912121
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 912121 - Adjust build configs and test manifests. r=glandium This step resumes shipping client and server DevTools components to the correct products, and is enough for "mach build" to complete successfully.
browser/app.mozbuild
browser/moz.build
devtools/client/framework/test/browser.ini
devtools/server/moz.build
devtools/shared/heapsnapshot/tests/gtest/moz.build
devtools/shared/moz.build
devtools/shared/shared/tests/browser/browser.ini
toolkit/moz.build
toolkit/toolkit.mozbuild
--- a/browser/app.mozbuild
+++ b/browser/app.mozbuild
@@ -12,9 +12,8 @@ if CONFIG['MOZ_EXTENSIONS']:
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 if CONFIG['MOZ_WEBAPP_RUNTIME']:
     DIRS += ['/webapprt']
 
 # Never add dirs after browser because they apparently won't get
 # packaged properly on Mac.
 DIRS += ['/browser']
-
--- a/browser/moz.build
+++ b/browser/moz.build
@@ -12,20 +12,20 @@ DIRS += [
     'base',
     'components',
     'experiments',
     'fuel',
     'locales',
     'modules',
     'themes',
     'extensions',
+    '/devtools/client',
 ]
 
 DIRS += [
-    'devtools',
     'app',
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -68,10 +68,9 @@ skip-if = os == "mac" && os_version == "
 [browser_toolbox_window_title_changes.js]
 [browser_toolbox_zoom.js]
 [browser_toolbox_custom_host.js]
 [browser_toolbox_theme_registration.js]
 [browser_toolbox_options_enable_serviceworkers_testing.js]
 [browser_toolbox_selected_tool_unavailable.js]
 
 # We want this test to run for mochitest-dt as well, so we include it here:
-[../../../base/content/test/general/browser_parsable_css.js]
-
+[../../../../browser/base/content/test/general/browser_parsable_css.js]
--- a/devtools/server/moz.build
+++ b/devtools/server/moz.build
@@ -45,16 +45,17 @@ EXTRA_JS_MODULES.devtools.server.actors 
     'actors/common.js',
     'actors/csscoverage.js',
     'actors/device.js',
     'actors/director-manager.js',
     'actors/director-registry.js',
     'actors/eventlooplag.js',
     'actors/framerate.js',
     'actors/gcli.js',
+    'actors/highlighters.css',
     'actors/highlighters.js',
     'actors/inspector.js',
     'actors/layout.js',
     'actors/memory.js',
     'actors/memprof.js',
     'actors/monitor.js',
     'actors/object.js',
     'actors/performance-entries.js',
--- a/devtools/shared/heapsnapshot/tests/gtest/moz.build
+++ b/devtools/shared/heapsnapshot/tests/gtest/moz.build
@@ -2,17 +2,17 @@
 # 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/.
 
 Library('devtoolstests')
 
 LOCAL_INCLUDES += [
-    '/toolkit/devtools/heapsnapshot',
+    '../..',
 ]
 
 UNIFIED_SOURCES = [
     'DeserializedNodeUbiNodes.cpp',
     'DeserializedStackFrameUbiStackFrames.cpp',
     'DoesCrossZoneBoundaries.cpp',
     'DoesntCrossZoneBoundaries.cpp',
     'SerializesEdgeNames.cpp',
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -11,17 +11,16 @@ DIRS += [
     'discovery',
     'gcli',
     'heapsnapshot',
     'jsbeautify',
     'performance',
     'pretty-fast',
     'qrcode',
     'security',
-    'server',
     'sourcemap',
     'shared',
     'styleinspector',
     'tern',
     'touch',
     'transport',
     'webconsole'
 ]
@@ -42,19 +41,11 @@ EXTRA_JS_MODULES.devtools += [
     'worker-loader.js',
 ]
 
 EXTRA_JS_MODULES.devtools += [
     'Console.jsm',
     'Loader.jsm',
 ]
 
-EXTRA_JS_MODULES.devtools.server.actors += [
-    'server/actors/highlighters.css'
-]
-
 EXTRA_JS_MODULES.devtools.layout += [
     'layout/utils.js'
 ]
-
-EXTRA_JS_MODULES.devtools.layout += [
-    'layout/utils.js'
-]
--- a/devtools/shared/shared/tests/browser/browser.ini
+++ b/devtools/shared/shared/tests/browser/browser.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
-  ../../../server/tests/browser/head.js
+  ../../../../server/tests/browser/head.js
 
 [browser_async_storage.js]
 [browser_worker-01.js]
 [browser_worker-02.js]
 [browser_worker-03.js]
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -2,17 +2,16 @@
 # 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 += [
     'components',
     'content',
-    'devtools',
     'forgetaboutsite',
     'identity',
     'locales',
     'modules',
     'mozapps/downloads',
     'mozapps/extensions',
     'mozapps/handling',
     'mozapps/preferences',
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -138,16 +138,18 @@ 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']