зеркало из https://github.com/mozilla/gecko-dev.git
bug 870407: move CMMSRCS to moz.build (logic). r=ted
This commit is contained in:
Родитель
f09c690d78
Коммит
bfff7a989d
|
@ -80,6 +80,7 @@ class TreeMetadataEmitter(object):
|
||||||
varmap = dict(
|
varmap = dict(
|
||||||
# Makefile.in : moz.build
|
# Makefile.in : moz.build
|
||||||
ASFILES='ASFILES',
|
ASFILES='ASFILES',
|
||||||
|
CMMSRCS='CMMSRCS',
|
||||||
CPPSRCS='CPP_SOURCES',
|
CPPSRCS='CPP_SOURCES',
|
||||||
CSRCS='CSRCS',
|
CSRCS='CSRCS',
|
||||||
DEFINES='DEFINES',
|
DEFINES='DEFINES',
|
||||||
|
|
|
@ -66,6 +66,12 @@ VARIABLES = {
|
||||||
This variable contains a list of files to invoke the assembler on.
|
This variable contains a list of files to invoke the assembler on.
|
||||||
"""),
|
"""),
|
||||||
|
|
||||||
|
'CMMSRCS': (StrictOrderingOnAppendList, list, [],
|
||||||
|
"""Sources to compile with the Objective C/C++ compiler.
|
||||||
|
|
||||||
|
This variable contains a list of objective-C++ sources to compile.
|
||||||
|
"""),
|
||||||
|
|
||||||
'CSRCS': (StrictOrderingOnAppendList, list, [],
|
'CSRCS': (StrictOrderingOnAppendList, list, [],
|
||||||
"""C code source files.
|
"""C code source files.
|
||||||
|
|
||||||
|
|
|
@ -14,3 +14,5 @@ DEFINES = ['-Dbar', '-Dfoo']
|
||||||
SIMPLE_PROGRAMS = ['bar.x', 'foo.x']
|
SIMPLE_PROGRAMS = ['bar.x', 'foo.x']
|
||||||
|
|
||||||
CSRCS += ['bar.c', 'foo.c']
|
CSRCS += ['bar.c', 'foo.c']
|
||||||
|
|
||||||
|
CMMSRCS = ['bar.mm', 'foo.mm']
|
||||||
|
|
|
@ -142,6 +142,10 @@ class TestRecursiveMakeBackend(BackendTester):
|
||||||
'ASFILES += bar.s',
|
'ASFILES += bar.s',
|
||||||
'ASFILES += foo.asm',
|
'ASFILES += foo.asm',
|
||||||
],
|
],
|
||||||
|
'CMMSRCS': [
|
||||||
|
'CMMSRCS += bar.mm',
|
||||||
|
'CMMSRCS += foo.mm',
|
||||||
|
],
|
||||||
'CSRCS': [
|
'CSRCS': [
|
||||||
'CSRCS += bar.c',
|
'CSRCS += bar.c',
|
||||||
'CSRCS += foo.c',
|
'CSRCS += foo.c',
|
||||||
|
|
|
@ -13,3 +13,5 @@ DEFINES=['-Dfans', '-Dtans']
|
||||||
SIMPLE_PROGRAMS += ['fans.x', 'tans.x']
|
SIMPLE_PROGRAMS += ['fans.x', 'tans.x']
|
||||||
|
|
||||||
CSRCS += ['fans.c', 'tans.c']
|
CSRCS += ['fans.c', 'tans.c']
|
||||||
|
|
||||||
|
CMMSRCS = ['fans.mm', 'tans.mm']
|
||||||
|
|
|
@ -126,6 +126,7 @@ class TestEmitterBasic(unittest.TestCase):
|
||||||
|
|
||||||
wanted = dict(
|
wanted = dict(
|
||||||
ASFILES=['fans.asm', 'tans.s'],
|
ASFILES=['fans.asm', 'tans.s'],
|
||||||
|
CMMSRCS=['fans.mm', 'tans.mm'],
|
||||||
CSRCS=['fans.c', 'tans.c'],
|
CSRCS=['fans.c', 'tans.c'],
|
||||||
DEFINES=['-Dfans', '-Dtans'],
|
DEFINES=['-Dfans', '-Dtans'],
|
||||||
SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
|
SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
|
||||||
|
|
Загрузка…
Ссылка в новой задаче