Bug 939044 - Make the build frontend and backend forget about MODULE. r=gps

python/mozbuild/mozbuild/frontend/emitter.py

@@ -133,15 +133,13 @@ class TreeMetadataEmitter(LoggingMixin):
 
         # XPIDL source files get processed and turned into .h and .xpt files.
         # If there are multiple XPIDL files in a directory, they get linked
-        # together into a final .xpt, which has the name defined by either
-        # MODULE or XPIDL_MODULE (if the latter is defined).
-        xpidl_module = sandbox['MODULE']
-        if sandbox['XPIDL_MODULE']:
-            xpidl_module = sandbox['XPIDL_MODULE']
+        # together into a final .xpt, which has the name defined by
+        # XPIDL_MODULE.
+        xpidl_module = sandbox['XPIDL_MODULE']
 
         if sandbox['XPIDL_SOURCES'] and not xpidl_module:
-            raise SandboxValidationError('MODULE or XPIDL_MODULE must be '
-                'defined if XPIDL_SOURCES is defined.')
+            raise SandboxValidationError('XPIDL_MODULE must be defined if '
+                'XPIDL_SOURCES is defined.')
 
         if sandbox['XPIDL_SOURCES'] and sandbox['NO_DIST_INSTALL']:
             self.log(logging.WARN, 'mozbuild_warning', dict(
@@ -184,7 +182,6 @@ class TreeMetadataEmitter(LoggingMixin):
             JS_MODULES_PATH='JS_MODULES_PATH',
             LIBS='LIBS',
             LIBXUL_LIBRARY='LIBXUL_LIBRARY',
-            MODULE='MODULE',
             MSVC_ENABLE_PGO='MSVC_ENABLE_PGO',
             NO_DIST_INSTALL='NO_DIST_INSTALL',
             OS_LIBS='OS_LIBS',

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -399,14 +399,6 @@ VARIABLES = {
         into account the values of ``AC_DEFINE`` instead of ``AC_SUBST``.
         """, None),
 
-    'MODULE': (unicode, unicode, "",
-        """Module name.
-
-        Historically, this variable was used to describe where to install header
-        files, but that feature is now handled by ``EXPORTS_NAMESPACES``.
-        ``MODULE`` will likely be removed in the future.
-        """, None),
-
     'EXPORTS': (HierarchicalStringList, list, HierarchicalStringList(),
         """List of files to be exported, and in which subdirectories.
 

python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build

@@ -2,8 +2,6 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-MODULE = 'module_name'
-
 SOURCES += ['bar.s', 'foo.asm']
 
 EXTRA_COMPONENTS = ['bar.js', 'foo.js']

python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build

@@ -2,5 +2,5 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-MODULE = 'my_module'
+XPIDL_MODULE = 'my_module'
 XPIDL_SOURCES = ['bar.idl', 'foo.idl']

python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build

@@ -2,8 +2,6 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-MODULE = 'module_name'
-
 SOURCES += ['fans.asm', 'tans.s']
 
 EXTRA_COMPONENTS=['fans.js', 'tans.js']

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -159,7 +159,6 @@ class TestEmitterBasic(unittest.TestCase):
             LIBXUL_LIBRARY=True,
             MSVC_ENABLE_PGO=True,
             NO_DIST_INSTALL=True,
-            MODULE='module_name',
             OS_LIBS=['foo.so', '-l123', 'aaa.a'],
             SDK_LIBRARY=['fans.sdk', 'tans.sdk'],
             SSRCS=['bans.S', 'fans.S'],