Commit 940d91af authored by Ricky Stewart's avatar Ricky Stewart
Browse files

Bug 1586358 - Replace existing instances of GENERATED_FILES with references to... 

Bug 1586358 - Replace existing instances of GENERATED_FILES with references to the GeneratedFile template r=nalexander

This patch doesn't remove all references to GENERATED_FILES, but does remove most of them, leaving only those which can't be trivially translated to the new template.

Try push: https://treeherder.mozilla.org/#/jobs?repo=try&revision=e4a25230c3992b9c5519ceb351fb37f6b2bf605e

Differential Revision: https://phabricator.services.mozilla.com/D48230

--HG--
extra : moz-landing-system : lando
parent cfbd01b5

accessible/ipc/win/typelib/moz.build

+1 −3
Original line number Diff line number Diff line
@@ -8,6 +8,4 @@ FINAL_TARGET_FILES += [ 
    '!Accessible.tlb',

]



GENERATED_FILES += [

    'Accessible.tlb',

]
 
GeneratedFile('Accessible.tlb')

accessible/xpcom/moz.build

+8 −4
Original line number Diff line number Diff line
@@ -56,11 +56,15 @@ else: 
        '/accessible/other',

    ]



GENERATED_FILES += [('xpcAccEvents.h', 'xpcAccEvents.cpp')]



xpc_acc = GENERATED_FILES[('xpcAccEvents.h', 'xpcAccEvents.cpp')]

xpc_acc.script = 'AccEventGen.py:gen_files'

xpc_acc.inputs += ['AccEvents.conf', '!/xpcom/idl-parser/xpidl/xpidllex.py', '!/xpcom/idl-parser/xpidl/xpidlyacc.py']

GeneratedFile(

    'xpcAccEvents.h', 'xpcAccEvents.cpp',

    script='AccEventGen.py', entry_point='gen_files',

    inputs=[

        'AccEvents.conf',

        '!/xpcom/idl-parser/xpidl/xpidllex.py',

        '!/xpcom/idl-parser/xpidl/xpidlyacc.py',

    ])



FINAL_LIBRARY = 'xul'

browser/app/winlauncher/freestanding/moz.build

+6 −12
Original line number Diff line number Diff line
@@ -42,18 +42,12 @@ OS_LIBS += [ 
]



if CONFIG['COMPILE_ENVIRONMENT']:

    ntdll_freestanding_lib = '%sntdll_freestanding.%s' % (CONFIG['LIB_PREFIX'],

                                                          CONFIG['LIB_SUFFIX'])



    GENERATED_FILES += [

        ntdll_freestanding_lib,

    ]



    ntdll_freestanding_gen = GENERATED_FILES[ntdll_freestanding_lib]

    ntdll_freestanding_gen.script = 'gen_ntdll_freestanding_lib.py'

    ntdll_freestanding_gen.inputs = ['ntdll_freestanding.def']

    ntdll_freestanding_gen.flags = [CONFIG['LLVM_DLLTOOL']] + \

                                   CONFIG['LLVM_DLLTOOL_FLAGS']

    GeneratedFile(

        '%sntdll_freestanding.%s' % (CONFIG['LIB_PREFIX'],

                                     CONFIG['LIB_SUFFIX']),

        script='gen_ntdll_freestanding_lib.py',

        inputs=['ntdll_freestanding.def'],

        flags=[CONFIG['LLVM_DLLTOOL']] + CONFIG['LLVM_DLLTOOL_FLAGS'])



DisableStlWrapping()

build/clang-plugin/moz.build

+5 −7
Original line number Diff line number Diff line
@@ -57,13 +57,11 @@ if CONFIG['ENABLE_MOZSEARCH_PLUGIN']: 
        'mozsearch-plugin/StringOperations.cpp',

    ]



GENERATED_FILES += ['ThirdPartyPaths.cpp']

third_party_paths = GENERATED_FILES['ThirdPartyPaths.cpp']

third_party_paths.script = "ThirdPartyPaths.py:generate"

third_party_paths.inputs = [

GeneratedFile('ThirdPartyPaths.cpp', script="ThirdPartyPaths.py",

              entry_point="generate", inputs=[

                  '/tools/rewriting/ThirdPartyPaths.txt',

                  '/tools/rewriting/Generated.txt',

]

              ])



HOST_COMPILE_FLAGS['STL'] = []

HOST_COMPILE_FLAGS['VISIBILITY'] = []

build/moz.build

+12 −15
Original line number Diff line number Diff line
@@ -78,27 +78,24 @@ if CONFIG['MOZ_APP_BASENAME']: 
        if CONFIG[var]:

            appini_defines[var] = True



    GENERATED_FILES += ['application.ini']

    GeneratedFile(

        'application.ini',

        script='../python/mozbuild/mozbuild/action/preprocessor.py',

        entry_point='generate',

        inputs=['application.ini.in'],

        flags=['-D%s=%s' % (k, '1' if v is True else v)

               for k, v in appini_defines.iteritems()])

    

    appini = GENERATED_FILES['application.ini']

    appini.script = '../python/mozbuild/mozbuild/action/preprocessor.py:generate'

    appini.inputs = ['application.ini.in']

    appini.flags = ['-D%s=%s' % (k, '1' if v is True else v)

                    for k, v in appini_defines.iteritems()]

    FINAL_TARGET_FILES += ['!application.ini']

    if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' and CONFIG['MOZ_UPDATER']:

        FINAL_TARGET_PP_FILES += ['update-settings.ini']



    GENERATED_FILES += ['application.ini.h']

    appini = GENERATED_FILES['application.ini.h']

    appini.script = 'appini_header.py'

    appini.inputs = ['!application.ini']

    GeneratedFile('application.ini.h', script='appini_header.py',

                  inputs=['!application.ini'])



if CONFIG['ENABLE_TESTS']:

    GENERATED_FILES += ['automation.py']

    auto = GENERATED_FILES['automation.py']

    auto.script = 'gen_automation.py'

    auto.inputs = ['automation.py.in']

    GeneratedFile('automation.py', script='gen_automation.py',

                  inputs=['automation.py.in'])



    TEST_HARNESS_FILES.reftest += [

        '!automation.py',