bug 870370: move EXTRA_COMPONENTS to moz.build (logic). r=ted

This commit is contained in:
Joey Armstrong 2013-06-06 10:22:32 -04:00
parent 70f8f88e39
commit 449b55515d
6 changed files with 15 additions and 0 deletions

View File

@ -84,6 +84,7 @@ class TreeMetadataEmitter(object):
CPPSRCS='CPP_SOURCES', CPPSRCS='CPP_SOURCES',
CSRCS='CSRCS', CSRCS='CSRCS',
DEFINES='DEFINES', DEFINES='DEFINES',
EXTRA_COMPONENTS='EXTRA_COMPONENTS',
MODULE='MODULE', MODULE='MODULE',
SIMPLE_PROGRAMS='SIMPLE_PROGRAMS', SIMPLE_PROGRAMS='SIMPLE_PROGRAMS',
XPIDL_FLAGS='XPIDL_FLAGS', XPIDL_FLAGS='XPIDL_FLAGS',

View File

@ -98,6 +98,12 @@ VARIABLES = {
delimiters. delimiters.
"""), """),
'EXTRA_COMPONENTS': (StrictOrderingOnAppendList, list, [],
"""Additional component files to distribute.
This variable contains a list of files to copy into $(FINAL_TARGET)/components/.
"""),
'PARALLEL_DIRS': (list, list, [], 'PARALLEL_DIRS': (list, list, [],
"""A parallel version of DIRS. """A parallel version of DIRS.

View File

@ -10,6 +10,7 @@ ASFILES = ['bar.s', 'foo.asm']
DEFINES = ['-Dbar', '-Dfoo'] DEFINES = ['-Dbar', '-Dfoo']
EXTRA_COMPONENTS = ['bar.js', 'foo.js']
SIMPLE_PROGRAMS = ['bar.x', 'foo.x'] SIMPLE_PROGRAMS = ['bar.x', 'foo.x']

View File

@ -154,6 +154,10 @@ class TestRecursiveMakeBackend(BackendTester):
'DEFINES += -Dbar', 'DEFINES += -Dbar',
'DEFINES += -Dfoo', 'DEFINES += -Dfoo',
], ],
'EXTRA_COMPONENTS': [
'EXTRA_COMPONENTS += bar.js',
'EXTRA_COMPONENTS += foo.js',
],
'SIMPLE_PROGRAMS': [ 'SIMPLE_PROGRAMS': [
'SIMPLE_PROGRAMS += bar.x', 'SIMPLE_PROGRAMS += bar.x',
'SIMPLE_PROGRAMS += foo.x', 'SIMPLE_PROGRAMS += foo.x',

View File

@ -10,6 +10,8 @@ ASFILES += ['fans.asm', 'tans.s']
DEFINES=['-Dfans', '-Dtans'] DEFINES=['-Dfans', '-Dtans']
EXTRA_COMPONENTS=['fans.js', 'tans.js']
SIMPLE_PROGRAMS += ['fans.x', 'tans.x'] SIMPLE_PROGRAMS += ['fans.x', 'tans.x']
CSRCS += ['fans.c', 'tans.c'] CSRCS += ['fans.c', 'tans.c']

View File

@ -129,6 +129,7 @@ class TestEmitterBasic(unittest.TestCase):
CMMSRCS=['fans.mm', 'tans.mm'], CMMSRCS=['fans.mm', 'tans.mm'],
CSRCS=['fans.c', 'tans.c'], CSRCS=['fans.c', 'tans.c'],
DEFINES=['-Dfans', '-Dtans'], DEFINES=['-Dfans', '-Dtans'],
EXTRA_COMPONENTS=['fans.js', 'tans.js'],
SIMPLE_PROGRAMS=['fans.x', 'tans.x'], SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
XPIDLSRCS=['bar.idl', 'biz.idl', 'foo.idl'], XPIDLSRCS=['bar.idl', 'biz.idl', 'foo.idl'],
XPIDL_MODULE='module_name', XPIDL_MODULE='module_name',