Commit 31d3fb67 authored by Nathan Froyd's avatar Nathan Froyd
Browse files

Bug 1413232 - move the default value for FILES_PER_UNIFIED_FILE to a more... 

Bug 1413232 - move the default value for FILES_PER_UNIFIED_FILE to a more logical location; r=nalexander

Putting it in emitter.py increases the obviousness of its default value
when searching for things.
parent cb2b9afe

python/mozbuild/mozbuild/frontend/data.py

+1 −1
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ class UnifiedSources(BaseSources): 
        'unified_source_mapping'

    )



    def __init__(self, context, files, canonical_suffix, files_per_unified_file=16):

    def __init__(self, context, files, canonical_suffix, files_per_unified_file):

        BaseSources.__init__(self, context, files, canonical_suffix)



        self.have_unified_mapping = files_per_unified_file > 1

python/mozbuild/mozbuild/frontend/emitter.py

+2 −3
Original line number Diff line number Diff line
@@ -882,9 +882,8 @@ class TreeMetadataEmitter(LoggingMixin): 
                    if canonical_suffix in ('.cpp', '.mm'):

                        cxx_sources[variable] = True

                    arglist = [context, list(files), canonical_suffix]

                    if (variable.startswith('UNIFIED_') and

                            'FILES_PER_UNIFIED_FILE' in context):

                        arglist.append(context['FILES_PER_UNIFIED_FILE'])

                    if variable.startswith('UNIFIED_'):

                        arglist.append(context.get('FILES_PER_UNIFIED_FILE', 16))

                    obj = cls(*arglist)

                    yield obj