Bug 948209 - Remove mozbuild.config. r=gps

This commit is contained in:
Mike Hommey 2013-12-11 10:59:02 +09:00
Родитель fadc315fab
Коммит 0229da7a2b
3 изменённых файлов: 0 добавлений и 36 удалений

Просмотреть файл

@ -67,7 +67,6 @@ MACH_MODULES = [
'python/mach_commands.py',
'python/mach/mach/commands/commandinfo.py',
'python/mozboot/mozboot/mach_commands.py',
'python/mozbuild/mozbuild/config.py',
'python/mozbuild/mozbuild/mach_commands.py',
'python/mozbuild/mozbuild/frontend/mach_commands.py',
'testing/mach_commands.py',

Просмотреть файл

@ -19,7 +19,6 @@ from mach.mixin.process import ProcessExecutionMixin
from mozfile.mozfile import rmtree
from .backend.configenvironment import ConfigEnvironment
from .config import BuildConfig
from .mozconfig import (
MozconfigFindException,
MozconfigLoadException,
@ -78,7 +77,6 @@ class MozbuildObject(ProcessExecutionMixin):
"""
self.topsrcdir = topsrcdir
self.settings = settings
self.config = BuildConfig(settings)
self.populate_logger()
self.log_manager = log_manager

Просмотреть файл

@ -1,33 +0,0 @@
# 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/.
from __future__ import unicode_literals
import multiprocessing
from mach.config import (
ConfigProvider,
PositiveIntegerType,
)
from mach.decorators import SettingsProvider
@SettingsProvider
class BuildConfig(ConfigProvider):
"""The configuration for mozbuild."""
def __init__(self, settings):
self.settings = settings
@classmethod
def _register_settings(cls):
def register(section, option, type_cls, **kwargs):
cls.register_setting(section, option, type_cls, domain='mozbuild',
**kwargs)
register('build', 'threads', PositiveIntegerType,
default=multiprocessing.cpu_count())