Commit 052ef806 authored by Daniel Varga's avatar Daniel Varga
Browse files

Backed out changeset 8d95f2c8867b (bug 1586358) for build bustage with FATAL... 

Backed out changeset 8d95f2c8867b (bug 1586358) for build bustage with FATAL ERROR PROCESSING MOZBUILD FILE. On a CLOSED TREE

--HG--
extra : rebase_source : 325fbad2455afc7f693087e75fa57dba79f4d86b
parent 368b562b

accessible/ipc/win/typelib/moz.build

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

]



GeneratedFile('Accessible.tlb')
 
GENERATED_FILES += [

    'Accessible.tlb',

]

accessible/xpcom/moz.build

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

    ]



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



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',

    ])

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']



FINAL_LIBRARY = 'xul'

browser/app/winlauncher/freestanding/moz.build

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



if CONFIG['COMPILE_ENVIRONMENT']:

    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'])

    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']



DisableStlWrapping()

build/clang-plugin/moz.build

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

    ]



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

              entry_point="generate", inputs=[

GENERATED_FILES += ['ThirdPartyPaths.cpp']

third_party_paths = GENERATED_FILES['ThirdPartyPaths.cpp']

third_party_paths.script = "ThirdPartyPaths.py:generate"

third_party_paths.inputs = [

    '/tools/rewriting/ThirdPartyPaths.txt',

    '/tools/rewriting/Generated.txt',

              ])

]



HOST_COMPILE_FLAGS['STL'] = []

HOST_COMPILE_FLAGS['VISIBILITY'] = []

build/moz.build

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

            appini_defines[var] = True



    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()])

    GENERATED_FILES += ['application.ini']



    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']



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

                  inputs=['!application.ini'])

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

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

    appini.script = 'appini_header.py'

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



if CONFIG['ENABLE_TESTS']:

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

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

    GENERATED_FILES += ['automation.py']

    auto = GENERATED_FILES['automation.py']

    auto.script = 'gen_automation.py'

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



    TEST_HARNESS_FILES.reftest += [

        '!automation.py',