Bug 883284 - Part a: Support LIBXUL_LIBRARY in moz.build; r=mshal

This commit is contained in:
Ms2ger 2013-08-22 08:55:59 +02:00
parent 8ccdba4aa0
commit 935a1ef07a
6 changed files with 13 additions and 0 deletions

View File

@ -132,6 +132,7 @@ class TreeMetadataEmitter(LoggingMixin):
JS_MODULES_PATH='JS_MODULES_PATH',
LIBRARY_NAME='LIBRARY_NAME',
LIBS='LIBS',
LIBXUL_LIBRARY='LIBXUL_LIBRARY',
MODULE='MODULE',
SDK_LIBRARY='SDK_LIBRARY',
SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS',

View File

@ -209,6 +209,12 @@ VARIABLES = {
A list of libraries and flags to include when linking.
"""),
'LIBXUL_LIBRARY': (bool, bool, False,
"""Whether the library in this directory is linked into libxul.
Implies MOZILLA_INTERNAL_API.
"""),
'SDK_LIBRARY': (StrictOrderingOnAppendList, list, [],
"""Elements of the distributed SDK.

View File

@ -41,3 +41,4 @@ CMMSRCS = ['bar.mm', 'foo.mm']
SSRCS = ['bar.S', 'foo.S']
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True

View File

@ -204,6 +204,9 @@ class TestRecursiveMakeBackend(BackendTester):
'LIBRARY_NAME': [
'LIBRARY_NAME := lib_name',
],
'LIBXUL_LIBRARY': [
'LIBXUL_LIBRARY := 1',
],
'SDK_LIBRARY': [
'SDK_LIBRARY += bar.sdk',
'SDK_LIBRARY += foo.sdk',

View File

@ -41,5 +41,6 @@ CMMSRCS = ['fans.mm', 'tans.mm']
SSRCS = ['fans.S', 'tans.S']
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
NO_DIST_INSTALL = True

View File

@ -145,6 +145,7 @@ class TestEmitterBasic(unittest.TestCase):
HOST_LIBRARY_NAME='host_fans',
LIBRARY_NAME='lib_name',
LIBS=['fans.lib', 'tans.lib'],
LIBXUL_LIBRARY=True,
NO_DIST_INSTALL='1',
MODULE='module_name',
SDK_LIBRARY=['fans.sdk', 'tans.sdk'],