Commit 978cb510 authored by J. Ryan Stinnett's avatar J. Ryan Stinnett
Browse files

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.
parent fb886b5b

b2g/app.mozbuild

+1 −0
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ if CONFIG['MOZ_EXTENSIONS']: 
DIRS += [

    '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],

    '/b2g',

    '/devtools',

]

b2g/graphene/app.mozbuild

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ if CONFIG['MOZ_EXTENSIONS']: 
DIRS += [

    '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],

    '/b2g',

    '/devtools',

]



# Add the defaults settings.

b2g/installer/package-manifest.in

+3 −0
Original line number Diff line number Diff line
@@ -748,6 +748,9 @@ 
#endif

#endif



; DevTools

@RESPATH@/chrome/devtools@JAREXT@

@RESPATH@/chrome/devtools.manifest



; shell icons

#ifdef XP_UNIX

browser/confvars.sh

+3 −0
Original line number Diff line number Diff line
@@ -66,3 +66,6 @@ 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

browser/installer/package-manifest.in

+2 −2
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
#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
@@ -263,7 +263,7 @@ 
@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