wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1204719 - Don't create interfaces.manifest files from the build backend. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2015-09-12 11:44:53 +09:00
parent 63b1aa45bd
commit 1d0357d014
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/makefiles/xpidl/Makefile.in
View File

@ -61,8 +61,14 @@ endif
chrome_manifests := @chrome_manifests@
%/interfaces.manifest: Makefile
$(call py_action,buildlist,$@ $(foreach xpt,$(filter $*/%,$(registered_xpt_files)),'interfaces $(notdir $(xpt))'))
interfaces_manifests := @interfaces_manifests@
xpidl_modules := @xpidl_modules@
xpt_files := @xpt_files@
registered_xpt_files := @registered_xpt_files@
xpt_files := $(registered_xpt_files) @xpt_files@
@xpidl_rules@
@ -70,7 +76,7 @@ depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)
GARBAGE += $(xpt_files) $(depends_files)
xpidl:: $(xpt_files) $(chrome_manifests)
xpidl:: $(xpt_files) $(chrome_manifests) $(interfaces_manifests)
$(xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(dist_include_dir))

6
python/mozbuild/mozbuild/action/buildlist.py
View File

@ -12,12 +12,16 @@ from __future__ import absolute_import, print_function
import sys
import os
from mozbuild.util import lock_file
from mozbuild.util import (
ensureParentDir,
lock_file,
)
def addEntriesToListFile(listFile, entries):
"""Given a file |listFile| containing one entry per line,
add each entry in |entries| to the file, unless it is already
present."""
ensureParentDir(listFile)
lock = lock_file(listFile + ".lck")
try:
if os.path.exists(listFile):

16
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -1100,6 +1100,7 @@ INSTALL_TARGETS += %(prefix)s
modules = manager.modules
xpt_modules = sorted(modules.keys())
xpt_files = set()
registered_xpt_files = set()
mk = Makefile()
@ -1131,15 +1132,16 @@ INSTALL_TARGETS += %(prefix)s
rules = StringIO()
mk.dump(rules, removal_guard=False)
# Write out manifests defining interfaces
interfaces_manifests = []
dist_dir = mozpath.join(self.environment.topobjdir, 'dist')
for manifest, entries in manager.interface_manifests.items():
path = mozpath.join(self.environment.topobjdir, manifest)
with self._write_file(path) as fh:
for xpt in sorted(entries):
fh.write('interfaces %s\n' % xpt)
interfaces_manifests.append(mozpath.join('$(DEPTH)', manifest))
for xpt in sorted(entries):
registered_xpt_files.add(mozpath.join(
'$(DEPTH)', mozpath.dirname(manifest), xpt))
if install_target.startswith('dist/'):
path = mozpath.join(self.environment.topobjdir, manifest)
path = mozpath.relpath(path, dist_dir)
prefix, subpath = path.split('/', 1)
key = 'dist_%s' % prefix
@ -1162,9 +1164,11 @@ INSTALL_TARGETS += %(prefix)s
obj.config = self.environment
self._create_makefile(obj, extra=dict(
chrome_manifests = ' '.join(chrome_manifests),
interfaces_manifests = ' '.join(interfaces_manifests),
xpidl_rules=rules.getvalue(),
xpidl_modules=' '.join(xpt_modules),
xpt_files=' '.join(sorted(xpt_files)),
xpt_files=' '.join(sorted(xpt_files - registered_xpt_files)),
registered_xpt_files=' '.join(sorted(registered_xpt_files)),
))
def _process_program(self, program, backend_file):