Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout changesets 53a9d03e4223, e61d18180feb and f07752f611f6 (bug 1233282) for a race condition bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Mike Hommey 2015-12-18 17:07:13 +09:00
parent 2e4662191e
commit 8ad03f4a21
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1233282 apparently needs a clobber
Bug 1186934 followup needed to clear bustage

9
config/Makefile.in
View File

@ -30,6 +30,15 @@ INSTALL_TARGETS += NSINSTALL
endif
endif
ifndef JS_STANDALONE
HEADERS_FILES = \
$(DEPTH)/mozilla-config.h \
$(NULL)
HEADERS_DEST := $(DIST)/include
HEADERS_TARGET := export
INSTALL_TARGETS += HEADERS
endif
include $(topsrcdir)/config/rules.mk
ifndef JS_STANDALONE

3
moz.build
View File

@ -28,9 +28,6 @@ if not CONFIG['JS_STANDALONE']:
CONFIGURE_DEFINE_FILES += [
'mozilla-config.h',
]
EXPORTS += [
'!mozilla-config.h',
]
DIRS += [
'build',

15
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -547,6 +547,12 @@ class TreeMetadataEmitter(LoggingMixin):
yield self._create_substitution(ConfigFileSubstitution, context,
path)
for path in context['CONFIGURE_DEFINE_FILES']:
script = mozpath.join(mozpath.dirname(mozpath.dirname(__file__)),
'action', 'process_define_files.py')
yield GeneratedFile(context, script, 'process_define_file', path,
[mozpath.join(context.srcdir, path + '.in')])
for obj in self._process_xpidl(context):
yield obj
@ -683,7 +689,7 @@ class TreeMetadataEmitter(LoggingMixin):
if mozpath.basename(f.full_path) not in generated_files:
raise SandboxValidationError(
('Objdir file listed in %s not in ' +
'GENERATED_FILES: %s') % (var, f), context)
'GENERATED_FILES: %s') % (var, path), context)
# Addons (when XPI_NAME is defined) and Applications (when
# DIST_SUBDIR is defined) use a different preferences directory
@ -895,13 +901,6 @@ class TreeMetadataEmitter(LoggingMixin):
xpidl_module, add_to_manifest=not context['XPIDL_NO_MANIFEST'])
def _process_generated_files(self, context):
for path in context['CONFIGURE_DEFINE_FILES']:
script = mozpath.join(mozpath.dirname(mozpath.dirname(__file__)),
'action', 'process_define_files.py')
yield GeneratedFile(context, script, 'process_define_file',
unicode(path),
[mozpath.join(context.srcdir, path + '.in')])
generated_files = context.get('GENERATED_FILES')
if not generated_files:
return