Bug 1203159 - Update each product's DevTools inclusion. r=glandium
A new configure option --with-devtools (which sets MOZ_DEVTOOLS) is added to
control whether all DevTools, just the server, or no DevTools are included.
This defaults to just the server.
Applications should also include /devtools within their moz.build tree, so that
DIST_SUBDIR is in effect for all DevTools files if it is used by the app.
--- a/b2g/app.mozbuild
+++ b/b2g/app.mozbuild
@@ -7,9 +7,10 @@
include('/toolkit/toolkit.mozbuild')
if CONFIG['MOZ_EXTENSIONS']:
DIRS += ['/extensions']
DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/b2g',
+ '/devtools',
]
--- a/b2g/graphene/app.mozbuild
+++ b/b2g/graphene/app.mozbuild
@@ -6,12 +6,13 @@
include('/toolkit/toolkit.mozbuild')
if CONFIG['MOZ_EXTENSIONS']:
DIRS += ['/extensions']
DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/b2g',
+ '/devtools',
]
# Add the defaults settings.
FINAL_TARGET_FILES.defaults += [ 'b2g/graphene/settings.json' ]
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -743,16 +743,19 @@
#ifdef XP_UNIX
#ifndef XP_MACOSX
@RESPATH@/chrome/icons/default/default16.png
@RESPATH@/chrome/icons/default/default32.png
@RESPATH@/chrome/icons/default/default48.png
#endif
#endif
+; DevTools
+@RESPATH@/chrome/devtools@JAREXT@
+@RESPATH@/chrome/devtools.manifest
; shell icons
#ifdef XP_UNIX
#ifndef XP_MACOSX
@RESPATH@/icons/*.xpm
@RESPATH@/icons/*.png
#endif
#endif
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -61,8 +61,11 @@ MOZ_WEBGL_CONFORMANT=1
MOZ_PAY=1
# Enable activities. These are used for FxOS developers currently.
MOZ_ACTIVITIES=1
MOZ_JSDOWNLOADS=1
MOZ_WEBM_ENCODER=1
# Enable checking that add-ons are signed by the trusted root
MOZ_ADDON_SIGNING=1
+
+# Include the DevTools client, not just the server (which is the default)
+MOZ_DEVTOOLS=all
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -179,17 +179,17 @@
@RESPATH@/components/content_events.xpt
@RESPATH@/components/content_html.xpt
@RESPATH@/components/content_geckomediaplugins.xpt
#ifdef MOZ_WEBRTC
@RESPATH@/components/content_webrtc.xpt
#endif
@RESPATH@/components/content_xslt.xpt
@RESPATH@/components/cookie.xpt
-@RESPATH@/components/devtools_security.xpt
+@RESPATH@/browser/components/devtools_security.xpt
@RESPATH@/components/directory.xpt
@RESPATH@/components/docshell.xpt
@RESPATH@/components/dom.xpt
#ifdef MOZ_ACTIVITIES
@RESPATH@/components/dom_activities.xpt
@RESPATH@/components/dom_messages.xpt
#endif
@RESPATH@/components/dom_apps.xpt
@@ -258,17 +258,17 @@
@RESPATH@/components/htmlparser.xpt
@RESPATH@/components/identity.xpt
@RESPATH@/components/imglib2.xpt
@RESPATH@/components/inspector.xpt
@RESPATH@/components/intl.xpt
@RESPATH@/components/jar.xpt
@RESPATH@/components/jsdebugger.xpt
@RESPATH@/components/jsdownloads.xpt
-@RESPATH@/components/jsinspector.xpt
+@RESPATH@/browser/components/jsinspector.xpt
@RESPATH@/components/layout_base.xpt
#ifdef NS_PRINTING
@RESPATH@/components/layout_printing.xpt
#endif
@RESPATH@/components/layout_xul_tree.xpt
@RESPATH@/components/layout_xul.xpt
@RESPATH@/components/locale.xpt
@RESPATH@/components/lwbrk.xpt
--- 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']
--- a/configure.in
+++ b/configure.in
@@ -3764,16 +3764,17 @@ MOZ_SIMPLEPUSH=
MOZ_PAY=
MOZ_AUDIO_CHANNEL_MANAGER=
MOZ_CONTENT_SANDBOX=
MOZ_GMP_SANDBOX=
MOZ_SANDBOX=1
MOZ_BINARY_EXTENSIONS=
MOZ_ADDON_SIGNING=
MOZ_REQUIRE_SIGNING=
+MOZ_DEVTOOLS=server
case "$target_os" in
mingw*)
NS_ENABLE_TSF=1
AC_DEFINE(NS_ENABLE_TSF)
;;
esac
@@ -7454,16 +7455,28 @@ dnl ====================================
MOZ_ARG_ENABLE_BOOL(debug-js-modules,
[ --enable-debug-js-modules Enable debug mode for frontend JS libraries],
DEBUG_JS_MODULES=1,
DEBUG_JS_MODULES=)
AC_SUBST(DEBUG_JS_MODULES)
dnl ========================================================
+dnl = Developer Tools
+dnl ========================================================
+
+MOZ_ARG_WITH_STRING(devtools,
+[ --with-devtools=(all|server|none)
+ Include all DevTools (with client), just the server,
+ or no tools. Defaults to "server".],
+ MOZ_DEVTOOLS=$withval)
+
+AC_SUBST(MOZ_DEVTOOLS)
+
+dnl ========================================================
dnl =
dnl = Profiling and Instrumenting
dnl =
dnl ========================================================
MOZ_ARG_HEADER(Profiling and Instrumenting)
dnl ========================================================
dnl = Enable TaskTracer
new file mode 100644
--- /dev/null
+++ b/devtools/moz.build
@@ -0,0 +1,16 @@
+# -*- 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/.
+
+if CONFIG['MOZ_DEVTOOLS'] == 'all':
+ DIRS += [
+ 'client',
+ ]
+
+if CONFIG['MOZ_DEVTOOLS'] == 'all' or CONFIG['MOZ_DEVTOOLS'] == 'server':
+ DIRS += [
+ 'server',
+ 'shared',
+ ]
--- a/mobile/android/app.mozbuild
+++ b/mobile/android/app.mozbuild
@@ -9,9 +9,10 @@ if CONFIG['ENABLE_TESTS']:
DIRS += ['/testing/instrumentation']
if CONFIG['MOZ_EXTENSIONS']:
DIRS += ['/extensions']
DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/mobile/android',
+ '/devtools',
]
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -503,16 +503,19 @@
@BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest
#ifdef XP_UNIX
@BINPATH@/chrome/icons/default/default16.png
@BINPATH@/chrome/icons/default/default32.png
@BINPATH@/chrome/icons/default/default48.png
#endif
+; DevTools
+@BINPATH@/chrome/devtools@JAREXT@
+@BINPATH@/chrome/devtools.manifest
; shell icons
#ifdef XP_UNIX
@BINPATH@/icons/*.xpm
@BINPATH@/icons/*.png
#endif
; [Default Preferences]
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -135,18 +135,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']