wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1217687 - Revert back to including /devtools via toolkit. r=glandium

Browse Source
This commit is contained in:
J. Ryan Stinnett 2015-10-23 02:39:38 -05:00
parent 6c65d07981
commit 9e7bc53212
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/app.mozbuild
View File

@ -12,5 +12,4 @@ if CONFIG['MOZ_EXTENSIONS']:
DIRS += [ DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'], '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/b2g', '/b2g',
'/devtools',
] ]

1
b2g/graphene/app.mozbuild
View File

@ -11,7 +11,6 @@ if CONFIG['MOZ_EXTENSIONS']:
DIRS += [ DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'], '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/b2g', '/b2g',
'/devtools',
] ]
# Add the defaults settings. # Add the defaults settings.

1
browser/moz.build
View File

@ -17,7 +17,6 @@ DIRS += [
'modules', 'modules',
'themes', 'themes',
'extensions', 'extensions',
'/devtools',
] ]
DIRS += [ DIRS += [

11
devtools/moz.build
View File

@ -4,13 +4,22 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_DEVTOOLS'] not in ('all', 'server'):
error('Unsupported MOZ_DEVTOOLS value: %s' % (CONFIG['MOZ_DEVTOOLS']))
if CONFIG['MOZ_DEVTOOLS'] == 'all': if CONFIG['MOZ_DEVTOOLS'] == 'all':
DIRS += [ DIRS += [
'client', 'client',
] ]
if CONFIG['MOZ_DEVTOOLS'] in ('all', 'server'):
DIRS += [ DIRS += [
'server', 'server',
'shared', 'shared',
] ]
# /browser uses DIST_SUBDIR. We opt-in to this treatment when building
# DevTools for the browser to keep the root omni.ja slim for use by external XUL
# apps. Mulet also uses this since it includes /browser.
if CONFIG['MOZ_BUILD_APP'] in ('browser', 'b2g/dev'):
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')

4
embedding/ios/app.mozbuild
View File

@ -8,7 +8,3 @@ include('/toolkit/toolkit.mozbuild')
if CONFIG['MOZ_EXTENSIONS']: if CONFIG['MOZ_EXTENSIONS']:
DIRS += ['/extensions'] DIRS += ['/extensions']
DIRS += [
'/devtools',
]

1
mobile/android/app.mozbuild
View File

@ -14,5 +14,4 @@ if CONFIG['MOZ_EXTENSIONS']:
DIRS += [ DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'], '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/mobile/android', '/mobile/android',
'/devtools',
] ]

1
mobile/android/b2gdroid/app.mozbuild
View File

@ -14,5 +14,4 @@ if CONFIG['MOZ_EXTENSIONS']:
DIRS += [ DIRS += [
'/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'], '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
'/mobile/android/b2gdroid', '/mobile/android/b2gdroid',
'/devtools',
] ]

1
toolkit/toolkit.mozbuild
View File

@ -140,6 +140,7 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
DIRS += ['/extensions/pref'] DIRS += ['/extensions/pref']
DIRS += [ DIRS += [
'/devtools',
'/services', '/services',
'/startupcache', '/startupcache',
'/js/ductwork/debugger', '/js/ductwork/debugger',

1
xulrunner/app.mozbuild
View File

@ -10,5 +10,4 @@ if CONFIG['MOZ_EXTENSIONS']:
DIRS += [ DIRS += [
'/xulrunner', '/xulrunner',
'/devtools',
] ]