Bug 1454811 - Update Tup backend due to chages in bug 1444745; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Wed, 18 Apr 2018 08:52:41 -0400
changeset 467925 b48bdfb834f32c6c20c20c942b461dc9b213a645
parent 467924 6ac1521dcbf922cee6eef91d3fce812603704c5f
child 467926 b180b277a1ef479b4135bd4194a39635c048dfe0
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1454811, 1444745
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1454811 - Update Tup backend due to chages in bug 1444745; r=chmanchester The xpidl-process.py invocation now takes a --bindings-conf parameter, and the final generated .cpp file uses a new python script and was moved from xpcom/typelib/xpt/XPTInfo.cpp to xptcom/reflect/xptinfo/xptdata.cpp MozReview-Commit-ID: C3vK3VzgG6Q
python/mozbuild/mozbuild/backend/tup.py
--- a/python/mozbuild/mozbuild/backend/tup.py
+++ b/python/mozbuild/mozbuild/backend/tup.py
@@ -665,16 +665,17 @@ class TupOnly(CommonBackend, PartialBack
             _, idls = data
             cmd = [
                 '$(PYTHON_PATH)',
                 '$(PLY_INCLUDE)',
                 '-I$(IDL_PARSER_DIR)',
                 '-I$(IDL_PARSER_CACHE_DIR)',
                 '$(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py',
                 '--cache-dir', '$(IDL_PARSER_CACHE_DIR)',
+                '--bindings-conf', '$(topsrcdir)/dom/bindings/Bindings.conf',
                 '$(DIST)/idl',
                 '$(DIST)/include',
                 '$(DIST)/xpcrs',
                 '.',
                 module,
             ]
             cmd.extend(sorted(idls))
 
@@ -690,30 +691,29 @@ class TupOnly(CommonBackend, PartialBack
                     self._installed_idls,
                 ],
                 display='XPIDL %s' % module,
                 cmd=cmd,
                 outputs=outputs,
                 extra_outputs=[self._installed_files],
             )
 
-        cpp_backend_file = self._get_backend_file('xpcom/typelib/xpt')
+        cpp_backend_file = self._get_backend_file('xpcom/reflect/xptinfo')
         cpp_backend_file.export_shell()
         cpp_backend_file.rule(
             inputs=all_xpts,
-            display='XPIDL linkgen %o',
+            display='XPIDL xptcodegen.py %o',
             cmd=[
                 '$(PYTHON_PATH)',
                 '$(PLY_INCLUDE)',
-                '$(topsrcdir)/xpcom/typelib/xpt/tools/xpt.py',
-                'linkgen',
-                'XPTInfo.cpp',
+                '$(topsrcdir)/xpcom/reflect/xptinfo/xptcodegen.py',
+                '%o',
                 '%f',
             ],
-            outputs=['XPTInfo.cpp'],
+            outputs=['xptdata.cpp'],
         )
 
     def _preprocess(self, backend_file, input_file, destdir=None, target=None):
         if target is None:
             target = mozpath.basename(input_file)
         # .css files use '%' as the preprocessor marker, which must be scaped as
         # '%%' in the Tupfile.
         marker = '%%' if target.endswith('.css') else '#'