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

--HG--
extra : rebase_source : d4a6b87a9fdde76d60aaf3876e8200e551ec958b
This commit is contained in:
Mike Shal 2018-04-18 08:52:41 -04:00
Родитель 3722bcaf82
Коммит d744090885
1 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -670,6 +670,7 @@ class TupOnly(CommonBackend, PartialBackend):
'-I$(IDL_PARSER_CACHE_DIR)', '-I$(IDL_PARSER_CACHE_DIR)',
'$(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py', '$(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py',
'--cache-dir', '$(IDL_PARSER_CACHE_DIR)', '--cache-dir', '$(IDL_PARSER_CACHE_DIR)',
'--bindings-conf', '$(topsrcdir)/dom/bindings/Bindings.conf',
'$(DIST)/idl', '$(DIST)/idl',
'$(DIST)/include', '$(DIST)/include',
'$(DIST)/xpcrs', '$(DIST)/xpcrs',
@ -695,20 +696,19 @@ class TupOnly(CommonBackend, PartialBackend):
extra_outputs=[self._installed_files], 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.export_shell()
cpp_backend_file.rule( cpp_backend_file.rule(
inputs=all_xpts, inputs=all_xpts,
display='XPIDL linkgen %o', display='XPIDL xptcodegen.py %o',
cmd=[ cmd=[
'$(PYTHON_PATH)', '$(PYTHON_PATH)',
'$(PLY_INCLUDE)', '$(PLY_INCLUDE)',
'$(topsrcdir)/xpcom/typelib/xpt/tools/xpt.py', '$(topsrcdir)/xpcom/reflect/xptinfo/xptcodegen.py',
'linkgen', '%o',
'XPTInfo.cpp',
'%f', '%f',
], ],
outputs=['XPTInfo.cpp'], outputs=['xptdata.cpp'],
) )
def _preprocess(self, backend_file, input_file, destdir=None, target=None): def _preprocess(self, backend_file, input_file, destdir=None, target=None):