bug 882907: move SDK_LIBRARY to mozbuild (logic) r=gps

This commit is contained in:
Joey Armstrong 2013-06-18 10:45:53 -04:00
parent 906f72de8e
commit 5fbbc5ef6f
6 changed files with 16 additions and 0 deletions

View File

@ -93,6 +93,7 @@ class TreeMetadataEmitter(object):
LIBRARY_NAME='LIBRARY_NAME',
LIBS='LIBS',
MODULE='MODULE',
SDK_LIBRARY='SDK_LIBRARY',
SIMPLE_PROGRAMS='SIMPLE_PROGRAMS',
SSRCS='SSRCS',
XPIDL_FLAGS='XPIDL_FLAGS',

View File

@ -160,6 +160,12 @@ VARIABLES = {
A list of libraries and flags to include when linking.
"""),
'SDK_LIBRARY': (StrictOrderingOnAppendList, list, [],
"""Elements of the distributed SDK.
Files on this list will be copied into SDK_LIB_DIR ($DIST/sdk/lib).
"""),
'SIMPLE_PROGRAMS': (StrictOrderingOnAppendList, list, [],
"""Generate a list of binaries from source.

View File

@ -20,6 +20,8 @@ HOST_LIBRARY_NAME = 'host_bar'
LIBRARY_NAME = 'lib_name'
LIBS = ['bar.lib', 'foo.lib']
SDK_LIBRARY = ['bar.sdk', 'foo.sdk']
SIMPLE_PROGRAMS = ['bar.x', 'foo.x']
CSRCS += ['bar.c', 'foo.c']

View File

@ -172,6 +172,10 @@ class TestRecursiveMakeBackend(BackendTester):
'LIBRARY_NAME': [
'LIBRARY_NAME := lib_name',
],
'SDK_LIBRARY': [
'SDK_LIBRARY += bar.sdk',
'SDK_LIBRARY += foo.sdk',
],
'SIMPLE_PROGRAMS': [
'SIMPLE_PROGRAMS += bar.x',
'SIMPLE_PROGRAMS += foo.x',

View File

@ -20,6 +20,8 @@ HOST_LIBRARY_NAME = 'host_fans'
LIBRARY_NAME = 'lib_name'
LIBS += ['fans.lib', 'tans.lib']
SDK_LIBRARY += ['fans.sdk', 'tans.sdk']
SIMPLE_PROGRAMS += ['fans.x', 'tans.x']
CSRCS += ['fans.c', 'tans.c']

View File

@ -135,6 +135,7 @@ class TestEmitterBasic(unittest.TestCase):
HOST_LIBRARY_NAME='host_fans',
LIBRARY_NAME='lib_name',
LIBS=['fans.lib', 'tans.lib'],
SDK_LIBRARY=['fans.sdk', 'tans.sdk'],
SIMPLE_PROGRAMS=['fans.x', 'tans.x'],
SSRCS=['fans.S', 'tans.S'],
XPIDLSRCS=['bar.idl', 'biz.idl', 'foo.idl'],