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 1043820 - Remove PARALLEL_DIRS. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2014-07-29 08:57:59 +09:00
parent 42f57b6138
commit 010c0a5eb7
78 changed files with 136 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/customizableui/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'content',
]

2
browser/components/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'about',
'customizableui',
'dirprovider',

2
browser/components/preferences/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['in-content']
DIRS += ['in-content']
BROWSER_CHROME_MANIFESTS += [
'in-content/tests/browser.ini',

2
browser/devtools/webide/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'content',
'components',
'themes',

2
browser/moz.build
View File

@ -6,7 +6,7 @@
CONFIGURE_SUBST_FILES += ['installer/Makefile']
PARALLEL_DIRS += [
DIRS += [
'base',
'components',
'experiments',

2
config/external/moz.build vendored
View File

@ -46,4 +46,4 @@ external_dirs += [
'media/libsoundtouch',
]
PARALLEL_DIRS += ['../../' + i for i in external_dirs]
DIRS += ['../../' + i for i in external_dirs]

1
config/makefiles/debugmake.mk
View File

@ -61,7 +61,6 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $
)
@echo --------------------------------------------------------------------------------
endif
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
showbuild:

13
config/recurse.mk
View File

@ -181,19 +181,9 @@ libs export tools::
else
define CREATE_SUBTIER_TRAVERSAL_RULE
PARALLEL_DIRS_$(1) = $$(addsuffix _$(1),$$(PARALLEL_DIRS))
.PHONY: $(1) $$(PARALLEL_DIRS_$(1))
ifdef PARALLEL_DIRS
$$(PARALLEL_DIRS_$(1)): %_$(1): %/Makefile
+@$$(call SUBMAKE,$(1),$$*)
endif
.PHONY: $(1)
$(1):: $$(SUBMAKEFILES)
ifdef PARALLEL_DIRS
+@$(MAKE) $$(PARALLEL_DIRS_$(1))
endif
$$(LOOP_OVER_DIRS)
endef
@ -232,5 +222,4 @@ endif
recurse:
@$(RECURSED_COMMAND)
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)

11
config/rules.mk
View File

@ -349,12 +349,6 @@ LOOP_OVER_DIRS = \
$(foreach dir,$(DIRS),$(call SUBMAKE,$@,$(dir)))
endif
# we only use this for the makefiles target and other stuff that doesn't matter
ifneq (,$(strip $(PARALLEL_DIRS)))
LOOP_OVER_PARALLEL_DIRS = \
$(foreach dir,$(PARALLEL_DIRS),$(call SUBMAKE,$@,$(dir)))
endif
#
# Now we can differentiate between objects used to build a library, and
# objects used to build an executable in the same directory.
@ -664,7 +658,7 @@ clean clobber realclean clobber_all distclean::
-$(call SUBMAKE,$@,$(dir)))
else
clean clobber realclean clobber_all distclean::
$(foreach dir,$(PARALLEL_DIRS) $(DIRS),-$(call SUBMAKE,$@,$(dir)))
$(foreach dir,$(DIRS),-$(call SUBMAKE,$@,$(dir)))
endif
distclean::
@ -1280,7 +1274,6 @@ endif # SDK_BINARY
chrome::
$(MAKE) realchrome
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
$(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome)
@ -1621,7 +1614,6 @@ tags: TAGS
TAGS: $(CSRCS) $(CPPSRCS) $(wildcard *.h)
-etags $(CSRCS) $(CPPSRCS) $(wildcard *.h)
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
ifndef INCLUDED_DEBUGMAKE_MK #{
@ -1637,7 +1629,6 @@ documentation:
ifdef ENABLE_TESTS
check::
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
endif

2
content/base/moz.build
View File

@ -4,5 +4,5 @@
# 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/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
TEST_DIRS += ['test']

2
content/html/content/moz.build
View File

@ -4,5 +4,5 @@
# 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/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
TEST_DIRS += ['test']

2
content/html/document/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
MOCHITEST_MANIFESTS += ['test/mochitest.ini']
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

2
content/html/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += ['content', 'document']
DIRS += ['content', 'document']

2
content/media/encoder/moz.build
View File

@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
PARALLEL_DIRS += ['fmp4_muxer']
DIRS += ['fmp4_muxer']
EXPORTS += [
'ContainerWriter.h',

4
content/media/fmp4/moz.build
View File

@ -21,7 +21,7 @@ SOURCES += [
]
if CONFIG['MOZ_WMF']:
PARALLEL_DIRS += [ 'wmf' ];
DIRS += [ 'wmf' ];
if CONFIG['MOZ_FFMPEG']:
EXPORTS += [
@ -31,7 +31,7 @@ if CONFIG['MOZ_FFMPEG']:
'ffmpeg/FFmpegLog.cpp',
'ffmpeg/FFmpegRuntimeLinker.cpp',
]
PARALLEL_DIRS += [
DIRS += [
'ffmpeg/libav53',
'ffmpeg/libav54',
'ffmpeg/libav55',

2
content/media/mediasource/moz.build
View File

@ -3,7 +3,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'test'
]

30
content/media/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'encoder',
'gmp',
'mediasource',
@ -16,42 +16,42 @@ PARALLEL_DIRS += [
TEST_DIRS += ['compiledtest']
if CONFIG['MOZ_RAW']:
PARALLEL_DIRS += ['raw']
DIRS += ['raw']
if CONFIG['MOZ_WAVE']:
PARALLEL_DIRS += ['wave']
DIRS += ['wave']
if CONFIG['MOZ_WEBM']:
PARALLEL_DIRS += ['webm']
DIRS += ['webm']
if CONFIG['MOZ_GSTREAMER']:
PARALLEL_DIRS += ['gstreamer']
DIRS += ['gstreamer']
if CONFIG['MOZ_DIRECTSHOW']:
PARALLEL_DIRS += ['directshow']
DIRS += ['directshow']
if CONFIG['MOZ_ANDROID_OMX']:
PARALLEL_DIRS += ['android']
DIRS += ['android']
if CONFIG['MOZ_WMF']:
PARALLEL_DIRS += ['wmf']
DIRS += ['wmf']
if CONFIG['MOZ_FMP4']:
PARALLEL_DIRS += ['fmp4']
DIRS += ['fmp4']
if CONFIG['MOZ_APPLEMEDIA']:
PARALLEL_DIRS += ['apple']
DIRS += ['apple']
PARALLEL_DIRS += ['webrtc']
DIRS += ['webrtc']
if CONFIG['MOZ_OMX_DECODER']:
PARALLEL_DIRS += ['omx']
PARALLEL_DIRS += ['omx/mediaresourcemanager']
DIRS += ['omx']
DIRS += ['omx/mediaresourcemanager']
PARALLEL_DIRS += ['webspeech']
DIRS += ['webspeech']
if CONFIG['MOZ_EME']:
PARALLEL_DIRS += ['eme']
DIRS += ['eme']
TEST_DIRS += [
'test',

2
content/media/webaudio/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['blink', 'test']
DIRS += ['blink', 'test']
TEST_DIRS += ['compiledtest']

4
content/media/webspeech/moz.build
View File

@ -3,7 +3,7 @@
# 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/.
PARALLEL_DIRS = ['synth']
DIRS = ['synth']
if CONFIG['MOZ_WEBSPEECH']:
PARALLEL_DIRS += ['recognition']
DIRS += ['recognition']

2
content/media/webspeech/synth/moz.build
View File

@ -35,7 +35,7 @@ if CONFIG['MOZ_WEBSPEECH']:
]
if CONFIG['MOZ_SYNTH_PICO']:
PARALLEL_DIRS = ['pico']
DIRS = ['pico']
IPDL_SOURCES += [
'ipc/PSpeechSynthesis.ipdl',

2
content/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'base',
'html',
'media',

2
content/svg/content/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['src']
DIRS += ['src']
MOCHITEST_MANIFESTS += ['test/mochitest.ini']

2
content/svg/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += ['document/src', 'content']
DIRS += ['document/src', 'content']

2
content/xul/content/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
TEST_DIRS += ['test']

2
content/xul/document/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
DIRS += ['test']

4
content/xul/moz.build
View File

@ -7,8 +7,8 @@
# We need to build document even if XUL is disabled, for the nsIController[s]
# interfaces and implementations.
# Likewise for content, because of nsXULAtoms.
PARALLEL_DIRS += ['document', 'content']
DIRS += ['document', 'content']
if CONFIG['MOZ_XUL']:
PARALLEL_DIRS += ['templates']
DIRS += ['templates']

2
content/xul/templates/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']

2
dom/activities/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']

2
dom/apps/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['src']
DIRS += ['src']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']

2
dom/cellbroadcast/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']

2
dom/downloads/moz.build
View File

@ -7,4 +7,4 @@
if CONFIG["MOZ_B2G"]:
MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
PARALLEL_DIRS += ['src']
DIRS += ['src']

2
dom/icc/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']

2
dom/messages/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['interfaces']
DIRS += ['interfaces']
EXTRA_COMPONENTS += [
'SystemMessageInternal.js',

2
dom/mobileconnection/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']
MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']

2
dom/mobileid/moz.build
View File

@ -4,6 +4,6 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']
MOCHITEST_MANIFESTS += ['test/mochitest.ini']

22
dom/moz.build
View File

@ -32,9 +32,9 @@ interfaces = [
'gamepad',
]
PARALLEL_DIRS += ['interfaces/' + i for i in interfaces]
DIRS += ['interfaces/' + i for i in interfaces]
PARALLEL_DIRS += [
DIRS += [
'animation',
'apps',
'base',
@ -91,16 +91,16 @@ PARALLEL_DIRS += [
]
if CONFIG['OS_ARCH'] == 'WINNT':
PARALLEL_DIRS += ['plugins/ipc/hangui']
DIRS += ['plugins/ipc/hangui']
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
PARALLEL_DIRS += [
DIRS += [
'speakermanager',
'wifi',
]
if CONFIG['MOZ_B2G_RIL']:
PARALLEL_DIRS += [
DIRS += [
'icc',
'cellbroadcast',
'mobileconnection',
@ -109,24 +109,24 @@ if CONFIG['MOZ_B2G_RIL']:
]
if CONFIG['MOZ_PAY']:
PARALLEL_DIRS += ['payment']
DIRS += ['payment']
if CONFIG['MOZ_GAMEPAD']:
PARALLEL_DIRS += ['gamepad']
DIRS += ['gamepad']
if CONFIG['MOZ_NFC']:
PARALLEL_DIRS += ['nfc']
DIRS += ['nfc']
if CONFIG['MOZ_B2G']:
PARALLEL_DIRS += [
DIRS += [
'downloads',
'mobileid'
]
if CONFIG['MOZ_B2G_BT_API_V2']:
PARALLEL_DIRS += ['bluetooth2']
DIRS += ['bluetooth2']
else:
PARALLEL_DIRS += ['bluetooth']
DIRS += ['bluetooth']
TEST_DIRS += [
'tests',

2
dom/network/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']
XPCSHELL_TESTS_MANIFESTS += [
'tests/unit/xpcshell.ini',

2
dom/payment/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['interfaces']
DIRS += ['interfaces']
EXTRA_JS_MODULES += [
'Payment.jsm',

2
dom/push/moz.build
View File

@ -3,4 +3,4 @@
# 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/.
PARALLEL_DIRS += ['src']
DIRS += ['src']

2
dom/wappush/moz.build
View File

@ -3,7 +3,7 @@
# 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/.
PARALLEL_DIRS += ['interfaces', 'src']
DIRS += ['interfaces', 'src']
if CONFIG['ENABLE_TESTS']:
XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']

2
dom/xbl/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['builtin']
DIRS += ['builtin']
EXPORTS += [
'nsBindingManager.h',

2
dom/xml/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['resources']
DIRS += ['resources']
TEST_DIRS += ['test']

2
dom/xslt/moz.build
View File

@ -20,7 +20,7 @@ EXPORTS += [
'nsIDocumentTransformer.h',
]
PARALLEL_DIRS += [
DIRS += [
'base',
'xml',
'xpath',

2
editor/libeditor/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += ['base', 'text', 'html']
DIRS += ['base', 'text', 'html']

2
editor/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'txtsvc',
'libeditor',
'txmgr',

2
extensions/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += CONFIG['MOZ_EXTENSIONS'].split()
DIRS += CONFIG['MOZ_EXTENSIONS'].split()

2
image/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['public', 'src', 'decoders', 'encoders']
DIRS += ['public', 'src', 'decoders', 'encoders']
DIRS += ['build']
TEST_DIRS += ['test']

2
intl/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'hyphenation',
'locale',
'locales',

2
layout/inspector/moz.build
View File

@ -49,7 +49,7 @@ LOCAL_INCLUDES += [
]
if CONFIG['ENABLE_TESTS']:
PARALLEL_DIRS += [
DIRS += [
'tests',
'tests/chrome',
]

2
layout/mathml/moz.build
View File

@ -47,7 +47,7 @@ LOCAL_INCLUDES += [
]
if CONFIG['ENABLE_TESTS']:
PARALLEL_DIRS += [
DIRS += [
'tests',
]

4
layout/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'style',
'base',
'generic',
@ -19,7 +19,7 @@ PARALLEL_DIRS += [
]
if CONFIG['NS_PRINTING']:
PARALLEL_DIRS += ['printing']
DIRS += ['printing']
TEST_DIRS += [
'tools/reftest',

4
layout/xul/moz.build
View File

@ -75,12 +75,12 @@ if CONFIG['MOZ_XUL']:
]
if CONFIG['ENABLE_TESTS']:
PARALLEL_DIRS += [
DIRS += [
'test',
]
if CONFIG['MOZ_XUL']:
PARALLEL_DIRS += ['tree', 'grid']
DIRS += ['tree', 'grid']
FAIL_ON_WARNINGS = True

2
mobile/android/moz.build
View File

@ -25,7 +25,7 @@ if not CONFIG['MOZ_ANDROID_MLS_STUMBLER']:
DIRS.remove('stumbler')
if not CONFIG['LIBXUL_SDK']:
PARALLEL_DIRS += ['../../xulrunner/tools/redit']
DIRS += ['../../xulrunner/tools/redit']
TEST_DIRS += [
'tests',

10
netwerk/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'base',
'cookie',
'dns',
@ -19,15 +19,15 @@ PARALLEL_DIRS += [
]
if CONFIG['MOZ_SRTP']:
PARALLEL_DIRS += ['srtp/src']
DIRS += ['srtp/src']
if CONFIG['MOZ_SCTP']:
PARALLEL_DIRS += ['sctp/src', 'sctp/datachannel']
DIRS += ['sctp/src', 'sctp/datachannel']
if CONFIG['NECKO_WIFI']:
PARALLEL_DIRS += ['wifi']
DIRS += ['wifi']
PARALLEL_DIRS += ['locales']
DIRS += ['locales']
DIRS += ['build']
TEST_DIRS += ['test']

2
netwerk/protocol/moz.build
View File

@ -4,4 +4,4 @@
# 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/.
PARALLEL_DIRS += sorted(CONFIG['NECKO_PROTOCOLS'])
DIRS += sorted(CONFIG['NECKO_PROTOCOLS'])

7
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -530,7 +530,7 @@ class RecursiveMakeBackend(CommonBackend):
# Because of bug 925236 and possible other unknown race conditions,
# don't parallelize the tools tier. There aren't many directories for
# this tier anyways, and none of them are under a PARALLEL_DIRS.
# this tier anyways.
def tools_filter(current, subdirs):
if current not in self._no_skip['tools'] \
or current.startswith('subtiers/'):
@ -848,11 +848,6 @@ class RecursiveMakeBackend(CommonBackend):
fh.write('DIRS := %s\n' % ' '.join(obj.dirs))
self._traversal.add(backend_file.relobjdir, dirs=relativize(obj.dirs))
if obj.parallel_dirs:
fh.write('PARALLEL_DIRS := %s\n' % ' '.join(obj.parallel_dirs))
self._traversal.add(backend_file.relobjdir,
parallel=relativize(obj.parallel_dirs))
if obj.test_dirs:
fh.write('TEST_DIRS := %s\n' % ' '.join(obj.test_dirs))
if self.environment.substs.get('ENABLE_TESTS', False):

2
python/mozbuild/mozbuild/frontend/data.py
View File

@ -102,7 +102,6 @@ class DirectoryTraversal(SandboxDerived):
"""
__slots__ = (
'dirs',
'parallel_dirs',
'test_dirs',
'tier_dirs',
'tier_static_dirs',
@ -112,7 +111,6 @@ class DirectoryTraversal(SandboxDerived):
SandboxDerived.__init__(self, sandbox)
self.dirs = []
self.parallel_dirs = []
self.test_dirs = []
self.tier_dirs = OrderedDict()
self.tier_static_dirs = OrderedDict()

1
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -934,7 +934,6 @@ class TreeMetadataEmitter(LoggingMixin):
def _emit_directory_traversal_from_sandbox(self, sandbox):
o = DirectoryTraversal(sandbox)
o.dirs = sandbox.get('DIRS', [])
o.parallel_dirs = sandbox.get('PARALLEL_DIRS', [])
o.test_dirs = sandbox.get('TEST_DIRS', [])
o.affected_tiers = sandbox.get_affected_tiers()

8
python/mozbuild/mozbuild/frontend/reader.py
View File

@ -800,7 +800,7 @@ class BuildReader(object):
self._sandbox_post_eval_cb(sandbox)
# We first collect directories populated in variables.
dir_vars = ['DIRS', 'PARALLEL_DIRS']
dir_vars = ['DIRS']
if sandbox.config.substs.get('ENABLE_TESTS', False) == '1':
dir_vars.append('TEST_DIRS')
@ -839,12 +839,6 @@ class BuildReader(object):
gyp_sandbox.update(gyp_dir.sandbox_vars)
gyp_sandboxes.append(gyp_sandbox)
# Add the gyp subdirectories to DIRS. We don't care about trying to
# place some of them in PARALLEL_DIRS because they're only going to be
# relevant for the compile and libs tiers. The compile tier is already
# parallelized, and the libs tier is always serialized, and will remain
# so until the library linking operations are moved out of it, at which
# point PARALLEL_DIRS will be irrelevant anyways.
for gyp_sandbox in gyp_sandboxes:
if self._sandbox_post_eval_cb:
self._sandbox_post_eval_cb(gyp_sandbox)

16
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
View File

@ -280,15 +280,6 @@ VARIABLES = {
Implies FORCE_SHARED_LIB.
""", None),
'PARALLEL_DIRS': (list, list,
"""A parallel version of ``DIRS``.
Ideally this variable does not exist. It is provided so a transition
from recursive makefiles can be made. Once the build system has been
converted to not use Makefile's for the build frontend, this will
likely go away.
""", None),
'PYTHON_UNIT_TESTS': (StrictOrderingOnAppendList, list,
"""A list of python unit tests.
""", None),
@ -930,9 +921,9 @@ FUNCTIONS = {
"""Make the specified variable available to all child directories.
The variable specified by the argument string is added to the
environment of all directories specified in the DIRS, PARALLEL_DIRS,
and TEST_DIRS variables. If those directories themselves have child
directories, the variable will be exported to all of them.
environment of all directories specified in the DIRS and TEST_DIRS
variables. If those directories themselves have child directories,
the variable will be exported to all of them.
The value used for the variable is the final value at the end of the
moz.build file, so it is possible (but not recommended style) to place
@ -1034,4 +1025,5 @@ SPECIAL_VARIABLES = {
DEPRECATION_HINTS = {
'TOOL_DIRS': 'Please use the DIRS variable instead.',
'TEST_TOOL_DIRS': 'Please use the TEST_DIRS variable instead.',
'PARALLEL_DIRS': 'Please use the DIRS variable instead.',
}

2
python/mozbuild/mozbuild/test/backend/data/stub0/moz.build
View File

@ -3,5 +3,5 @@
# http://creativecommons.org/publicdomain/zero/1.0/
DIRS += ['dir1']
PARALLEL_DIRS += ['dir2']
DIRS += ['dir2']
TEST_DIRS += ['dir3']

3
python/mozbuild/mozbuild/test/backend/test_recursivemake.py
View File

@ -212,8 +212,7 @@ class TestRecursiveMakeBackend(BackendTester):
lines = [l.strip() for l in open(p, 'rt').readlines()[2:]]
self.assertEqual(lines, [
'DIRS := dir1',
'PARALLEL_DIRS := dir2',
'DIRS := dir1 dir2',
'TEST_DIRS := dir3',
])

1
python/mozbuild/mozbuild/test/frontend/data/traversal-all-vars/moz.build
View File

@ -3,5 +3,4 @@
# http://creativecommons.org/publicdomain/zero/1.0/
DIRS += ['regular']
PARALLEL_DIRS = ['parallel']
TEST_DIRS = ['test']

6
python/mozbuild/mozbuild/test/frontend/test_emitter.py
View File

@ -87,7 +87,6 @@ class TestEmitterBasic(unittest.TestCase):
for o in objs:
self.assertIsInstance(o, DirectoryTraversal)
self.assertEqual(o.parallel_dirs, [])
self.assertEqual(o.test_dirs, [])
self.assertEqual(len(o.tier_dirs), 0)
self.assertEqual(len(o.tier_static_dirs), 0)
@ -103,20 +102,19 @@ class TestEmitterBasic(unittest.TestCase):
def test_traversal_all_vars(self):
reader = self.reader('traversal-all-vars')
objs = self.read_topsrcdir(reader, filter_common=False)
self.assertEqual(len(objs), 4)
self.assertEqual(len(objs), 3)
for o in objs:
self.assertIsInstance(o, DirectoryTraversal)
reldirs = set([o.relativedir for o in objs])
self.assertEqual(reldirs, set(['', 'parallel', 'regular', 'test']))
self.assertEqual(reldirs, set(['', 'regular', 'test']))
for o in objs:
reldir = o.relativedir
if reldir == '':
self.assertEqual(o.dirs, ['regular'])
self.assertEqual(o.parallel_dirs, ['parallel'])
self.assertEqual(o.test_dirs, ['test'])
def test_tier_simple(self):

2
python/mozbuild/mozbuild/test/frontend/test_reader.py
View File

@ -66,7 +66,7 @@ class TestBuildReader(unittest.TestCase):
reader = self.reader('traversal-all-vars', enable_tests=True)
sandboxes = list(reader.read_topsrcdir())
self.assertEqual(len(sandboxes), 4)
self.assertEqual(len(sandboxes), 3)
def test_tiers_traversal(self):
reader = self.reader('traversal-tier-simple')

2
services/fxaccounts/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['interfaces']
DIRS += ['interfaces']
TEST_DIRS += ['tests']

2
services/mobileid/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += ['interfaces']
DIRS += ['interfaces']
TEST_DIRS += ['tests']

12
services/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'common',
'crypto',
'fxaccounts',
@ -14,18 +14,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
# MOZ_SERVICES_HEALTHREPORT and therefore MOZ_DATA_REPORTING are
# defined on Android, but these features are implemented using Java.
if CONFIG['MOZ_SERVICES_HEALTHREPORT']:
PARALLEL_DIRS += ['healthreport']
DIRS += ['healthreport']
if CONFIG['MOZ_DATA_REPORTING']:
PARALLEL_DIRS += ['datareporting']
DIRS += ['datareporting']
if CONFIG['MOZ_SERVICES_METRICS']:
PARALLEL_DIRS += ['metrics']
DIRS += ['metrics']
if CONFIG['MOZ_SERVICES_SYNC']:
PARALLEL_DIRS += ['sync']
DIRS += ['sync']
if CONFIG['MOZ_B2G']:
PARALLEL_DIRS += ['mobileid']
DIRS += ['mobileid']
SPHINX_TREES['services'] = 'docs'

2
testing/mochitest/tests/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'SimpleTest',
'browser',
]

24
toolkit/components/moz.build
View File

@ -6,9 +6,9 @@
# These component dirs are built for all apps (including suite)
if CONFIG['MOZ_ENABLE_XREMOTE']:
PARALLEL_DIRS += ['remote']
DIRS += ['remote']
PARALLEL_DIRS += [
DIRS += [
'aboutcache',
'aboutmemory',
'addoncompat',
@ -52,34 +52,34 @@ PARALLEL_DIRS += [
]
if CONFIG['MOZ_CRASHREPORTER']:
PARALLEL_DIRS += ['crashes']
DIRS += ['crashes']
if CONFIG['MOZ_SOCIAL']:
PARALLEL_DIRS += ['social']
DIRS += ['social']
if CONFIG['BUILD_CTYPES']:
PARALLEL_DIRS += ['ctypes']
DIRS += ['ctypes']
if CONFIG['MOZ_FEEDS']:
PARALLEL_DIRS += ['feeds']
DIRS += ['feeds']
if CONFIG['MOZ_HELP_VIEWER']:
PARALLEL_DIRS += ['help']
DIRS += ['help']
if CONFIG['NS_PRINTING']:
PARALLEL_DIRS += ['printing']
DIRS += ['printing']
if CONFIG['MOZ_XUL']:
PARALLEL_DIRS += ['autocomplete', 'satchel']
DIRS += ['autocomplete', 'satchel']
if CONFIG['MOZ_TOOLKIT_SEARCH']:
PARALLEL_DIRS += ['search']
DIRS += ['search']
if CONFIG['MOZ_URL_CLASSIFIER']:
PARALLEL_DIRS += ['url-classifier']
DIRS += ['url-classifier']
if CONFIG['MOZ_CAPTIVEDETECT']:
PARALLEL_DIRS += ['captivedetect']
DIRS += ['captivedetect']
DIRS += ['build']

2
toolkit/components/promiseworker/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'worker'
]

2
toolkit/devtools/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'server',
'client',
'gcli',

2
toolkit/devtools/qrcode/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'decoder',
'encoder'
]

18
toolkit/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'components',
'content',
'devtools',
@ -31,24 +31,24 @@ if CONFIG['MOZ_MAINTENANCE_SERVICE']:
DIRS += ['xre']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
PARALLEL_DIRS += ['system/unixproxy']
DIRS += ['system/unixproxy']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
PARALLEL_DIRS += ['system/osxproxy']
DIRS += ['system/osxproxy']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
PARALLEL_DIRS += ['system/windowsproxy']
DIRS += ['system/windowsproxy']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
PARALLEL_DIRS += ['system/androidproxy']
DIRS += ['system/androidproxy']
if CONFIG['MOZ_CRASHREPORTER']:
PARALLEL_DIRS += ['crashreporter']
DIRS += ['crashreporter']
elif CONFIG['MOZ_ENABLE_PROFILER_SPS']:
# Profiler requires some crashreporter code,
# so build it even if crashreporter is disabled.
PARALLEL_DIRS += [
DIRS += [
'crashreporter/google-breakpad/src/common',
'crashreporter/google-breakpad/src/processor',
]
if CONFIG['OS_ARCH'] == 'Darwin':
PARALLEL_DIRS += ['crashreporter/google-breakpad/src/common/mac']
DIRS += ['crashreporter/google-breakpad/src/common/mac']
elif CONFIG['OS_ARCH'] == 'Linux':
PARALLEL_DIRS += ['crashreporter/google-breakpad/src/common/linux']
DIRS += ['crashreporter/google-breakpad/src/common/linux']

2
uriloader/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'base',
'exthandler',
'prefetch',

2
widget/shared/moz.build
View File

@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_X11']:
PARALLEL_DIRS += ['x11']
DIRS += ['x11']
UNIFIED_SOURCES += [
'nsShmImage.cpp',

2
xpcom/moz.build
View File

@ -4,7 +4,7 @@
# 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/.
PARALLEL_DIRS += [
DIRS += [
'idl-parser',
]

4
xulrunner/moz.build
View File

@ -6,7 +6,7 @@
CONFIGURE_SUBST_FILES += ['installer/Makefile']
PARALLEL_DIRS += [
DIRS += [
'app',
'stub',
'examples',
@ -16,4 +16,4 @@ if CONFIG['MAKENSISU']:
DIRS += ['installer/windows']
if CONFIG['OS_ARCH'] == 'WINNT':
PARALLEL_DIRS += ['tools/redit']
DIRS += ['tools/redit']