Backout changesets 53a9d03e4223, e61d18180feb and f07752f611f6 (bug 1233282) for a race condition bustage on a CLOSED TREE.
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 18 Dec 2015 17:07:13 +0900
changeset 316355 e3b277208e732916273c9b9fea265d5e5feb8485
parent 316354 f07752f611f6ff596b28b635142873e7befca80b
child 316356 d5cd24a0cf599052277c1edc4cde7cb871a1faa7
push id8532
push userjlorenzo@mozilla.com
push dateFri, 18 Dec 2015 14:31:20 +0000
bugs1233282
milestone46.0a1
backs out53a9d03e4223083de8016ef26bcc7649603f2506
e61d18180febc8560140f2eafbd9e3c19f4488a0
f07752f611f6ff596b28b635142873e7befca80b
Backout changesets 53a9d03e4223, e61d18180feb and f07752f611f6 (bug 1233282) for a race condition bustage on a CLOSED TREE.
CLOBBER
config/Makefile.in
moz.build
python/mozbuild/mozbuild/frontend/emitter.py
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # 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
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -25,16 +25,25 @@ nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROG
 
 NSINSTALL_EXECUTABLES := nsinstall$(HOST_BIN_SUFFIX)
 NSINSTALL_DEST := $(DIST)/bin
 NSINSTALL_TARGET := host
 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
 ifndef MOZ_PROFILE_USE
 # Generate a new buildid every time we "export" in config... that's only
 # supposed to be once per-build!
 export:: buildid
 
--- a/moz.build
+++ b/moz.build
@@ -23,19 +23,16 @@ DIRS += [
 
 if not CONFIG['JS_STANDALONE']:
     CONFIGURE_SUBST_FILES += [
         'tools/update-packaging/Makefile',
     ]
     CONFIGURE_DEFINE_FILES += [
         'mozilla-config.h',
     ]
-    EXPORTS += [
-        '!mozilla-config.h',
-    ]
 
     DIRS += [
         'build',
         'probes',
     ]
 
 DIRS += [
     'config/external/zlib',
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -542,16 +542,22 @@ class TreeMetadataEmitter(LoggingMixin):
         # We always emit a directory traversal descriptor. This is needed by
         # the recursive make backend.
         for o in self._emit_directory_traversal_from_context(context): yield o
 
         for path in context['CONFIGURE_SUBST_FILES']:
             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
 
         # Proxy some variables as-is until we have richer classes to represent
         # them. We should aim to keep this set small because it violates the
         # desired abstraction of the build definition away from makefiles.
         passthru = VariablePassthru(context)
         varlist = [
@@ -678,17 +684,17 @@ class TreeMetadataEmitter(LoggingMixin):
                         if not os.path.exists(path):
                             raise SandboxValidationError(
                                 'File listed in %s does not exist: %s'
                                 % (var, path), context)
                     else:
                         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
             # (default/preferences) from the one the GRE uses (defaults/pref).
             # Hence, we move the files from the latter to the former in that
             # case.
             if has_prefs and (context.get('XPI_NAME') or
                               context.get('DIST_SUBDIR')):
@@ -890,23 +896,16 @@ class TreeMetadataEmitter(LoggingMixin):
                 path=context.main_path),
                 '{path}: DIST_INSTALL = False has no effect on XPIDL_SOURCES.')
 
         for idl in context['XPIDL_SOURCES']:
             yield XPIDLFile(context, mozpath.join(context.srcdir, idl),
                 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
 
         for f in generated_files:
             flags = generated_files[f]
             output = f
             inputs = []