Bug 1445763 - Update moz.build meta data with "Firefox Build System". r=froydnj
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 14 Mar 2018 21:44:46 +0100
changeset 408500 ebc10f1dd72278b794b4dc7ee34d1811e4daff0f
parent 408499 ee3711829e200f5a7bd92a4cf869b40931fc8a11
child 408501 48cacb921dab306445279bbf78d8f252a716b878
push id33645
push userrgurzau@mozilla.com
push dateFri, 16 Mar 2018 17:49:51 +0000
treeherdermozilla-central@3b10b50a72d7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1445763
milestone61.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 1445763 - Update moz.build meta data with "Firefox Build System". r=froydnj MozReview-Commit-ID: 3FrWJ6441pe
browser/app/moz.build
browser/components/build/moz.build
browser/locales/moz.build
browser/moz.build
build/docs/files-metadata.rst
build/moz.build
config/moz.build
intl/moz.build
modules/libbz2/moz.build
moz.build
python/moz.build
python/mozbuild/mozbuild/frontend/context.py
python/mozbuild/mozbuild/mach_commands.py
python/mozbuild/mozbuild/test/frontend/data/files-info/bug_component/final/moz.build
python/mozbuild/mozbuild/test/frontend/data/files-info/bug_component/simple/moz.build
python/mozbuild/mozbuild/test/frontend/test_reader.py
security/moz.build
services/moz.build
third_party/moz.build
third_party/python/moz.build
toolkit/components/build/moz.build
toolkit/content/moz.build
toolkit/locales/moz.build
toolkit/moz.build
tools/moz.build
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -15,19 +15,19 @@ with Files("splash.rc"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 
 with Files("macversion.py"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 with Files("macbuild/**"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("moz.build"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 with Files("Makefile.in"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/**"):
     BUG_COMPONENT = ("Firefox", "Theme")
 with Files("profile/channel-prefs.js"):
     BUG_COMPONENT = ("Firefox", "Installer")
 with Files("profile/firefox.js"):
     BUG_COMPONENT = ("Firefox", "General")
 
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Firefox", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 EXPORTS += [
     'nsBrowserCompsCID.h',
 ]
 
 SOURCES += [
     'nsModule.cpp',
 ]
--- a/browser/locales/moz.build
+++ b/browser/locales/moz.build
@@ -21,17 +21,17 @@ if CONFIG['MOZ_UPDATER']:
         '../installer/windows/nsis/updater_append.ini',
     ]
     # Yes, this is weird, but what can you do? This file doesn't want to be in the DIST_SUBDIR,
     # but we can't really move it to a different directory until we change how locale repacks
     # work.
     LOCALIZED_FILES['..'] += ['!updater.ini']
 
 with Files("**"):
-    BUG_COMPONENT = ("Toolkit", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("all-locales"):
     BUG_COMPONENT = ("Core", "Localization")
 
 with Files("en-US/**"):
     BUG_COMPONENT = ("Core", "Localization")
 
 with Files("search/**"):
--- a/browser/moz.build
+++ b/browser/moz.build
@@ -60,44 +60,44 @@ JS_PREFERENCE_PP_FILES += [
 ]
 FINAL_TARGET_FILES += ['app/blocklist.xml']
 FINAL_TARGET_FILES.defaults += ['app/permissions']
 
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "General")
 
 with Files("Makefile.in"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("*.mk"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("**/moz.build"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("moz.configure"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("app.mozbuild"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("moz.build"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("confvars.sh"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("LICENSE"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("branding/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
 with Files("config/**"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("docs/**"):
     BUG_COMPONENT = ("Toolkit", "Telemetry")
 
 with Files("fonts/**"):
     BUG_COMPONENT = ("Core", "Graphics: Text")
 
 with Files("installer/**"):
--- a/build/docs/files-metadata.rst
+++ b/build/docs/files-metadata.rst
@@ -12,21 +12,21 @@ file of interest and it does something i
 Defining Metadata
 =================
 
 Files metadata is defined by using the
 :ref:`Files Sub-Context <mozbuild_subcontext_Files>` in ``moz.build``
 files. e.g.::
 
     with Files('**/Makefile.in'):
-        BUG_COMPONENT = ('Core', 'Build Config')
+        BUG_COMPONENT = ('Firefox Build System', 'General')
 
 This working example says, *for all Makefile.in files in every directory
 underneath this one - including this directory - set the Bugzilla
-component to Core :: Build Config*.
+component to Firefox Build System :: General*.
 
 For more info, read the
 :ref:`docs on Files <mozbuild_subcontext_Files>`.
 
 How Metadata is Read
 ====================
 
 ``Files`` metadata is extracted in :ref:`mozbuild_fs_reading_mode`.
@@ -130,28 +130,28 @@ Finalizing of values is performed by set
 on ``Files`` sub-contexts. See the
 :ref:`Files documentation <mozbuild_subcontext_Files>` for more.
 
 Here is an example with ``Makefile.in`` files, showing how it is
 possible to finalize the ``BUG_COMPONENT`` value.::
 
     # /moz.build
     with Files('**/Makefile.in'):
-        BUG_COMPONENT = ('Core', 'Build Config')
+        BUG_COMPONENT = ('Firefox Build System', 'General')
         FINAL = True
 
     # /foo/moz.build
     with Files('**'):
         BUG_COMPONENT = ('Another', 'Component')
 
 If we query for metadata of ``/foo/Makefile.in``, both ``Files``
 sub-contexts match the file pattern. However, since ``BUG_COMPONENT`` is
 marked as finalized by ``/moz.build``, the assignment from
 ``/foo/moz.build`` is ignored. The final value for ``BUG_COMPONENT``
-is ``('Core', 'Build Config')``.
+is ``('Firefox Build System', 'General')``.
 
 Here is another example::
 
     with Files('*.cpp'):
         BUG_COMPONENT = ('One-Off', 'For C++')
         FINAL = True
 
     with Files('**'):
--- a/build/moz.build
+++ b/build/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 # This cannot be named "build" because of bug 922191.
 SPHINX_TREES['buildsystem'] = 'docs'
 
 with Files('docs/**'):
     SCHEDULES.exclusive = ['docs']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
--- a/config/moz.build
+++ b/config/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozunit.py'):
     BUG_COMPONENT = ('Testing', 'Python Test')
 
 DIST_INSTALL = False
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 NoVisibilityFlags()
--- a/intl/moz.build
+++ b/intl/moz.build
@@ -44,9 +44,9 @@ with Files("icu-patches/**"):
 
 with Files("tzdata/**"):
     BUG_COMPONENT = ("Core", "JavaScript: Internationalization API")
 
 with Files("update*"):
     BUG_COMPONENT = ("Core", "JavaScript: Internationalization API")
 
 with Files("icu_sources_data.py"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
--- a/modules/libbz2/moz.build
+++ b/modules/libbz2/moz.build
@@ -1,11 +1,11 @@
 # -*- Mode: python; 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 DIRS += ['src']
 
--- a/moz.build
+++ b/moz.build
@@ -9,58 +9,58 @@ with Files('AUTHORS'):
 
 with Files('LICENSE'):
     BUG_COMPONENT = ('mozilla.org', 'Licensing')
 
 with Files('LEGAL'):
     BUG_COMPONENT = ('mozilla.org', 'Licensing')
 
 with Files('aclocal.m4'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('Cargo.*'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('client.*'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('CLOBBER'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('*configure*'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mach'):
     BUG_COMPONENT = ('Core', 'mach')
 
 with Files('*moz*'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('GNUmakefile'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('*gradle*'):
     BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
     SCHEDULES.exclusive = ['android']
 
 with Files('*.json'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('**/l10n.toml'):
     BUG_COMPONENT = ('Core', 'Localization')
     FINAL = True
 
 with Files('README.txt'):
     BUG_COMPONENT = ('Core', 'General')
 
 with Files("nsprpub/**"):
     BUG_COMPONENT = ("NSPR", "NSPR")
 
 with Files('**/Makefile.in'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
     FINAL = True
 
 with Files("**/*.js"):
     SCHEDULES.inclusive += ['test-verify', 'docs']
 
 with Files("**/*.jsm"):
     SCHEDULES.inclusive += ['docs']
 
--- a/python/moz.build
+++ b/python/moz.build
@@ -1,38 +1,38 @@
 # -*- Mode: python; 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/.
 
 # Default extra components to build config
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('devtools/**'):
     BUG_COMPONENT = ('Firefox', 'Developer Tools')
 
 with Files('mach/**'):
     BUG_COMPONENT = ('Core', 'mach')
 
 with Files('mozboot/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'Bootstrap Configuration')
 
 with Files('mozbuild/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozlint/**'):
     BUG_COMPONENT = ('Testing', 'Lint')
 
 with Files('mozversioncontrol/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('l10n/**'):
-    BUG_COMPONENT = ('Core', 'Localization')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozrelease/**'):
     BUG_COMPONENT = ('Release Engineering', 'Release Automation')
 
 with Files('mach_commands.py'):
     BUG_COMPONENT = ('Testing', 'Python Test')
 
 SPHINX_PYTHON_PACKAGE_DIRS += [
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -980,17 +980,17 @@ class Files(SubContext):
     wildcard. e.g. ``**/foo``.
     """
 
     VARIABLES = {
         'BUG_COMPONENT': (BugzillaComponent, tuple,
             """The bug component that tracks changes to these files.
 
             Values are a 2-tuple of unicode describing the Bugzilla product and
-            component. e.g. ``('Core', 'Build Config')``.
+            component. e.g. ``('Firefox Build System', 'General')``.
             """),
 
         'FINAL': (bool, bool,
             """Mark variable assignments as finalized.
 
             During normal processing, values from newer Files contexts
             overwrite previously set values. Last write wins. This behavior is
             not always desired. ``FINAL`` provides a mechanism to prevent
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -57,18 +57,18 @@ EXCESSIVE_SWAP_MESSAGE = '''
 PERFORMANCE WARNING
 
 Your machine experienced a lot of swap activity during the build. This is
 possibly a sign that your machine doesn't have enough physical memory or
 not enough available memory to perform the build. It's also possible some
 other system activity during the build is to blame.
 
 If you feel this message is not appropriate for your machine configuration,
-please file a Core :: Build Config bug at
-https://bugzilla.mozilla.org/enter_bug.cgi?product=Core&component=Build%20Config
+please file a Firefox Build System :: General bug at
+https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox%20Build%20System&component=General
 and tell us about your machine and build configuration so we can adjust the
 warning heuristic.
 ===================
 '''
 
 
 class StoreDebugParamsAndWarnAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
--- a/python/mozbuild/mozbuild/test/frontend/data/files-info/bug_component/final/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/files-info/bug_component/final/moz.build
@@ -1,3 +1,3 @@
 with Files('**/Makefile.in'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
     FINAL = True
--- a/python/mozbuild/mozbuild/test/frontend/data/files-info/bug_component/simple/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/files-info/bug_component/simple/moz.build
@@ -1,2 +1,2 @@
 with Files('*'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
--- a/python/mozbuild/mozbuild/test/frontend/test_reader.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_reader.py
@@ -366,18 +366,18 @@ class TestBuildReader(unittest.TestCase)
                          BugzillaComponent('default_product', 'default_component'))
 
     def test_files_bug_component_simple(self):
         reader = self.reader('files-info')
 
         v = reader.files_info(['bug_component/simple/moz.build'])
         self.assertEqual(len(v), 1)
         flags = v['bug_component/simple/moz.build']
-        self.assertEqual(flags['BUG_COMPONENT'].product, 'Core')
-        self.assertEqual(flags['BUG_COMPONENT'].component, 'Build Config')
+        self.assertEqual(flags['BUG_COMPONENT'].product, 'Firefox Build System')
+        self.assertEqual(flags['BUG_COMPONENT'].component, 'General')
 
     def test_files_bug_component_different_matchers(self):
         reader = self.reader('files-info')
 
         v = reader.files_info([
             'bug_component/different-matchers/foo.jsm',
             'bug_component/different-matchers/bar.cpp',
             'bug_component/different-matchers/baz.misc'])
@@ -398,19 +398,19 @@ class TestBuildReader(unittest.TestCase)
             'bug_component/final/foo',
             'bug_component/final/Makefile.in',
             'bug_component/final/subcomponent/Makefile.in',
             'bug_component/final/subcomponent/bar'])
 
         self.assertEqual(v['bug_component/final/foo']['BUG_COMPONENT'],
             BugzillaComponent('default_product', 'default_component'))
         self.assertEqual(v['bug_component/final/Makefile.in']['BUG_COMPONENT'],
-            BugzillaComponent('Core', 'Build Config'))
+            BugzillaComponent('Firefox Build System', 'General'))
         self.assertEqual(v['bug_component/final/subcomponent/Makefile.in']['BUG_COMPONENT'],
-            BugzillaComponent('Core', 'Build Config'))
+            BugzillaComponent('Firefox Build System', 'General'))
         self.assertEqual(v['bug_component/final/subcomponent/bar']['BUG_COMPONENT'],
             BugzillaComponent('Another', 'Component'))
 
     def test_file_test_deps(self):
         reader = self.reader('files-test-metadata')
 
         expected = {
             'simple/src/module.jsm': set(['simple/tests/test_general.html',
--- a/security/moz.build
+++ b/security/moz.build
@@ -3,17 +3,17 @@
 # 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/.
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "Security: PSM")
 
 with Files("generate*.py"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "General")
 
 with Files("nss/**"):
     BUG_COMPONENT = ("NSS", "Libraries")
 
 with Files("nss.symbols"):
     BUG_COMPONENT = ("NSS", "Libraries")
 
 if CONFIG['MOZ_SYSTEM_NSS']:
--- a/services/moz.build
+++ b/services/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files('moz.build'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 DIRS += [
     'common',
     'crypto',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += [
--- a/third_party/moz.build
+++ b/third_party/moz.build
@@ -1,11 +1,11 @@
 with Files('moz.build'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('aom/**'):
     BUG_COMPONENT = ('Core', 'Audio/Video: Playback')
 
 with Files('rust/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('webkit/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
--- a/third_party/python/moz.build
+++ b/third_party/python/moz.build
@@ -1,53 +1,53 @@
 # -*- Mode: python; 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/.
 
 # Default extra components to build config
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('PyECC/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
 
 with Files('blessings/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('compare-locales/**'):
     BUG_COMPONENT = ('Localization Infrastructure and Tools', 'compare-locales')
 
 with Files('configobj/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('dlmanager/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('futures/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('gdbpp/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('jsmin/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
 
 with Files('lldbutils/**'):
     BUG_COMPONENT = ('Core', 'General')
 
 with Files('mock-1.0.0/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('psutil/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('py/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('pyasn1/**'):
     BUG_COMPONENT = ('Release Engineering', 'General Automation')
 
 with Files('pyasn1-modules/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
 
 with Files('pylru/**'):
@@ -55,33 +55,33 @@ with Files('pylru/**'):
 
 with Files('pystache/**'):
     BUG_COMPONENT = ('Taskcluster', 'General')
 
 with Files('pytest/**'):
     BUG_COMPONENT = ('Testing', 'General')
 
 with Files('pytoml/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('pyyaml/**'):
     BUG_COMPONENT = ('Taskcluster', 'General')
 
 with Files('redo/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('requests*/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('rsa/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
 
 with Files('slugid/**'):
     BUG_COMPONENT = ('Taskcluster', 'Platform Libraries')
 
 with Files('virtualenv/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('voluptuous/**'):
     BUG_COMPONENT = ('Taskcluster', 'Task Configuration')
 
 with Files('which/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Toolkit', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 EXPORTS += [
     'nsToolkitCompsCID.h',
 ]
 
 SOURCES += [
     'nsToolkitCompsModule.cpp',
 ]
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -236,17 +236,17 @@ with Files('aboutTelemetry*'):
 
 with Files('autocomplete.css'):
     BUG_COMPONENT = ('Firefox', 'Search')
 
 with Files('browser-*.js'):
     BUG_COMPONENT = ('Toolkit', 'General')
 
 with Files('buildconfig.html'):
-    BUG_COMPONENT = ('Toolkit', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('contentAreaUtils.js'):
     BUG_COMPONENT = ('Toolkit', 'General')
 
 with Files('*picker*'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 
 with Files('direction*'):
--- a/toolkit/locales/moz.build
+++ b/toolkit/locales/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Toolkit', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
   DEFINES['MOZ_FENNEC'] = True
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
   DEFINES['MOZ_GTK'] = True
 
 JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -44,26 +44,26 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['system/androidproxy']
 
 TEST_HARNESS_FILES.testing.mochitest.browser.toolkit.crashreporter.test.browser += [
     'crashreporter/test/browser/crashreport.sjs',
 ]
 
 with Files('moz.*'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('toolkit.mozbuild'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('nss.configure'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('library/**'):
-    BUG_COMPONENT = ('Core', 'Build Config')
+    BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozapps/installer/windows/**'):
     BUG_COMPONENT = ('Toolkit', 'NSIS Installer')
 
 with Files('mozapps/preferences/**'):
     BUG_COMPONENT = ('Toolkit', 'Preferences')
 
 with Files('pluginproblem/**'):
--- a/tools/moz.build
+++ b/tools/moz.build
@@ -15,17 +15,17 @@ with Files("compare-locales/docs/**"):
 
 with Files("compare-locales/mach_commands.py"):
     BUG_COMPONENT = ("Localization Infrastructure and Tools", "compare-locales")
 
 with Files("coverity/**"):
     BUG_COMPONENT = ("Core", "Rewriting and Analysis")
 
 with Files("docs/**"):
-    BUG_COMPONENT = ("Core", "Build Config")
+    BUG_COMPONENT = ("Firefox Build System", "Generated Documentation")
     SCHEDULES.exclusive = ['docs']
 
 with Files("lint/**"):
     BUG_COMPONENT = ("Testing", "Lint")
 
 with Files("profiler/**"):
     BUG_COMPONENT = ("Core", "Gecko Profiler")