Chronological shuffle for 69a1

mozilla-release/patches/1542746-3no2-69a1.patch

@@ -2,7 +2,7 @@
 # User Nathan Froyd <froydnj@mozilla.com>
 # Date 1558728038 0
 # Node ID 085342ba416f464742b068edd32f20fae8e18e87
-# Parent  e3cd7898b7d0ccee5e757d8049108b9ae6387b8f
+# Parent  71943ff277fd491f9df77d2bda129ee4059ee2cc
 Bug 1542746 - remove code for frontend-based PGO instrumentation; r=dmajor
 
 We're moving to IR-level PGO instrumentation for clang-cl.  We've also
@@ -15,14 +15,14 @@ Differential Revision: https://phabricator.services.mozilla.com/D31134
 diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
 --- a/build/pgo/profileserver.py
 +++ b/build/pgo/profileserver.py
-@@ -54,19 +54,16 @@ if __name__ == '__main__':
-                                      build.topsrcdir, 'tools', 'quitter',
-                                      'quitter@mozilla.org.xpi')],
-                                  locations=locations)
+@@ -74,19 +74,16 @@ if __name__ == '__main__':
+                 if e not in env:
+                     continue
  
-         env = os.environ.copy()
-         env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
-         env["XPCOM_DEBUG_BREAK"] = "warn"
+                 vcdir = os.path.abspath(os.path.join(env[e], '../../VC/bin'))
+                 if os.path.exists(vcdir):
+                     env['PATH'] = '%s;%s' % (vcdir, env['PATH'])
+                     break
  
 -        # Add MOZ_OBJDIR to the env so that cygprofile.cpp can use it.
 -        env["MOZ_OBJDIR"] = build.topobjdir
@@ -60,7 +60,7 @@ diff --git a/config/config.mk b/config/config.mk
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -163,20 +163,16 @@ ifdef MOZ_PROFILE_GENERATE
+@@ -172,20 +172,16 @@ ifdef MOZ_PROFILE_GENERATE
  SIMPLE_PROGRAMS :=
  endif
  
@@ -234,7 +234,7 @@ diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
 diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
 --- a/python/mozbuild/mozbuild/backend/common.py
 +++ b/python/mozbuild/mozbuild/backend/common.py
-@@ -218,30 +218,23 @@ class CommonBackend(BuildBackend):
+@@ -216,30 +216,23 @@ class CommonBackend(BuildBackend):
      def _expand_libs(self, input_bin):
          os_libs = []
          shared_libs = []
@@ -265,7 +265,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
                  if lib.no_pgo_objs or lib.no_pgo:
                      no_pgo_objs.append(o)
  
-@@ -280,18 +273,17 @@ class CommonBackend(BuildBackend):
+@@ -278,18 +271,17 @@ class CommonBackend(BuildBackend):
                      seen_libs.add(lib)
                      shared_libs.append(lib)
  
@@ -308,8 +308,8 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
                  '.cpp': 'HOST_CPPSRCS',
              }
              variables = [suffix_map[obj.canonical_suffix]]
-             if isinstance(obj, HostGeneratedSources):
-@@ -1380,17 +1376,17 @@ class RecursiveMakeBackend(CommonBackend
+             if isinstance(obj, GeneratedSources):
+@@ -1378,17 +1374,17 @@ class RecursiveMakeBackend(CommonBackend
              return os.path.normpath(mozpath.join(mozpath.relpath(lib.objdir, obj.objdir),
                                                   name))
  
@@ -328,7 +328,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          profile_gen_objs = []
  
          if obj.KIND == 'target':
-@@ -1402,18 +1398,16 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1400,18 +1396,16 @@ class RecursiveMakeBackend(CommonBackend
              if doing_pgo and obj_suffix_change_needed:
                  # We use a different OBJ_SUFFIX for the profile generate phase on
                  # systems where the pgo generate phase requires instrumentation
@@ -350,7 +350,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
 diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -455,17 +455,16 @@ class CompileFlags(BaseCompileFlags):
+@@ -442,17 +442,16 @@ class CompileFlags(BaseCompileFlags):
                  'NSPR_CFLAGS', 'NSS_CFLAGS', 'MOZ_JPEG_CFLAGS', 'MOZ_PNG_CFLAGS',
                  'MOZ_ZLIB_CFLAGS', 'MOZ_PIXMAN_CFLAGS')))),
               ('CXXFLAGS', 'CFLAGS')),
@@ -368,7 +368,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
               ('CXXFLAGS', 'CFLAGS', 'CXX_LDFLAGS', 'C_LDFLAGS')),
              ('OS_CFLAGS', context.config.substs.get('OS_CFLAGS'),
               ('CFLAGS', 'C_LDFLAGS')),
-@@ -1208,17 +1207,17 @@ SUBCONTEXTS = {cls.__name__: cls for cls
+@@ -1195,17 +1194,17 @@ SUBCONTEXTS = {cls.__name__: cls for cls
  
  # This defines the set of mutable global variables.
  #

mozilla-release/patches/1542963-2-69a1.patch

@@ -2,7 +2,7 @@
 # User Justin Wood <Callek@gmail.com>
 # Date 1559053320 0
 # Node ID 41e1409393169e979098e02645f3dfe190b19ef2
-# Parent  645d27b4c43ebe06bf66cb8fbaccab0d2458deae
+# Parent  c863d15a29f92ea376ce8b7026e22fdb63f6c8ba
 Bug 1542963 - run './mach lint ... --fix' on mozbuild/mozbuild, undoes some black changes. r=glandium
 
 Lint python/mozbuild/{mozbuild,mozpack}.
@@ -1381,7 +1381,7 @@ diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/ar
 diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
 --- a/python/mozbuild/mozbuild/backend/common.py
 +++ b/python/mozbuild/mozbuild/backend/common.py
-@@ -49,16 +49,17 @@ from mozbuild.jar import (
+@@ -48,16 +48,17 @@ from mozbuild.jar import (
  from mozbuild.preprocessor import Preprocessor
  from mozpack.chrome.manifest import parse_manifest_line
  
@@ -1399,7 +1399,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
          self.topobjdir = config.topobjdir
  
          self.idls = {}
-@@ -99,16 +100,17 @@ class XPIDLManager(object):
+@@ -98,16 +99,17 @@ class XPIDLManager(object):
  
  class BinariesCollection(object):
      """Tracks state of binaries produced by the build."""
@@ -1417,10 +1417,10 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
          self._binaries = BinariesCollection()
          self._configs = set()
          self._generated_sources = set()
-@@ -170,17 +172,18 @@ class CommonBackend(BuildBackend):
-             if obj.required_during_compile or obj.required_before_compile:
-                 for f in itertools.chain(obj.required_before_compile,
-                                          obj.required_during_compile):
+@@ -168,17 +170,18 @@ class CommonBackend(BuildBackend):
+         elif isinstance(obj, GeneratedFile):
+             if obj.required_for_compile:
+                 for f in obj.required_for_compile:
                      fullpath = ObjDirPath(obj._context, '!' + f).full_path
                      self._handle_generated_sources([fullpath])
              return False
@@ -1437,7 +1437,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
              # These are only handled by special purpose build backends,
              # ignore them here.
              return True
-@@ -190,17 +193,16 @@ class CommonBackend(BuildBackend):
+@@ -188,17 +191,16 @@ class CommonBackend(BuildBackend):
  
          return True
  
@@ -1455,7 +1455,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
          with self._write_file(mozpath.join(topobjdir, 'binaries.json')) as fh:
              d = {
                  'shared_libraries': [s.to_dict() for s in self._binaries.shared_libraries],
-@@ -310,17 +312,18 @@ class CommonBackend(BuildBackend):
+@@ -308,17 +310,18 @@ class CommonBackend(BuildBackend):
  
          mkdir(objdir)
          with self._write_file(list_file_path) as fh:
@@ -1475,7 +1475,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
          all_inputs = set(webidls.all_static_sources())
          for s in webidls.all_non_static_basenames():
              all_inputs.add(mozpath.join(bindings_dir, s))
-@@ -374,17 +377,17 @@ class CommonBackend(BuildBackend):
+@@ -372,17 +375,17 @@ class CommonBackend(BuildBackend):
                  'so it cannot be built in unified mode."\n'
                  '#undef PL_ARENA_CONST_ALIGN_MASK\n'
                  '#endif\n'
@@ -2091,7 +2091,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          if not isinstance(obj, ContextDerived):
              return False
  
-@@ -604,29 +605,29 @@ class RecursiveMakeBackend(CommonBackend
+@@ -600,29 +601,29 @@ class RecursiveMakeBackend(CommonBackend
                  backend_file.write('EXTRA_MDDEPEND_FILES += %s\n' % dep_file)
  
                  backend_file.write("""{stub}: {script}{inputs}{backend}{force}
@@ -2134,7 +2134,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          elif isinstance(obj, RustProgram):
              self._process_rust_program(obj, backend_file)
              # Hook the program into the compile graph.
-@@ -776,29 +777,29 @@ class RecursiveMakeBackend(CommonBackend
+@@ -772,29 +773,29 @@ class RecursiveMakeBackend(CommonBackend
  
          root_deps_mk = Makefile()
  
@@ -2167,7 +2167,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          # - nodes that have no dependencies of their own. Technically, this is
          #   not necessary, because other things have dependencies on them, and
          #   they all end up rooting to nodes from the above category. But the
-@@ -890,18 +891,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -886,18 +887,18 @@ class RecursiveMakeBackend(CommonBackend
          makefile.add_statement(explanation)
  
          all_sources = ' '.join(source for source, _ in unified_source_mapping)
@@ -2188,7 +2188,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
      def _check_blacklisted_variables(self, makefile_in, makefile_content):
          if b'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content:
-@@ -937,58 +938,58 @@ class RecursiveMakeBackend(CommonBackend
+@@ -933,58 +934,58 @@ class RecursiveMakeBackend(CommonBackend
                  makefile_in = mozpath.join(srcdir, 'Makefile.in')
                  makefile = mozpath.join(objdir, 'Makefile')
  
@@ -2252,7 +2252,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          self._fill_root_mk()
  
          # Make the master test manifest files.
-@@ -1058,17 +1059,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1054,17 +1055,17 @@ class RecursiveMakeBackend(CommonBackend
  
          def relativize(base, dirs):
              return (mozpath.relpath(d.translated, base) for d in dirs)
@@ -2271,7 +2271,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
      def _process_defines(self, obj, backend_file, which='DEFINES'):
          """Output the DEFINES rules to the given backend file."""
          defines = list(obj.get_defines())
-@@ -1082,17 +1083,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1078,17 +1079,18 @@ class RecursiveMakeBackend(CommonBackend
          # much as possible here to avoid breaking things.
          if obj.xpiname:
              backend_file.write('XPI_NAME = %s\n' % (obj.xpiname))
@@ -2291,7 +2291,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          build_files = self._install_manifests['xpidl']
  
          for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done'):
-@@ -1101,17 +1103,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1097,17 +1099,17 @@ class RecursiveMakeBackend(CommonBackend
          for idl in manager.idls.values():
              self._install_manifests['dist_idl'].add_link(idl['source'],
                  idl['basename'])
@@ -2310,7 +2310,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
          mk = Makefile()
  
-@@ -1162,19 +1164,19 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1158,19 +1160,19 @@ class RecursiveMakeBackend(CommonBackend
  
          # Create dependency for output header so we force regeneration if the
          # header was deleted. This ideally should not be necessary. However,
@@ -2332,7 +2332,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              interfaces_manifests = ' '.join(interfaces_manifests),
              xpidl_rules=rules.getvalue(),
              xpidl_modules=' '.join(xpt_modules),
-@@ -1244,45 +1246,45 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1240,45 +1242,45 @@ class RecursiveMakeBackend(CommonBackend
          self._install_manifests['_tests'].add_optional_exists(
              mozpath.join(obj.install_target[len('_tests') + 1:],
                           dest_basename))
@@ -2381,7 +2381,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              if isinstance(obj.manifest, ReftestManifest):
                  # Mark included files as part of the build backend so changes
                  # result in re-config.
-@@ -1303,17 +1305,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1299,17 +1301,18 @@ class RecursiveMakeBackend(CommonBackend
          if quoted_path != path:
              path = quoted_path[0] + d + quoted_path[1:]
          else:
@@ -2401,7 +2401,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
      def _process_non_default_target(self, libdef, target_name, backend_file):
          backend_file.write("%s:: %s\n" % (libdef.output_category, target_name))
-@@ -1364,17 +1367,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1362,17 +1365,17 @@ class RecursiveMakeBackend(CommonBackend
      def _process_host_shared_library(self, libdef, backend_file):
          backend_file.write('HOST_SHARED_LIBRARY = %s\n' % libdef.lib_name)
  
@@ -2420,7 +2420,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
          topobjdir = mozpath.normsep(obj.topobjdir)
          # This will create the node even if there aren't any linked libraries.
-@@ -1419,17 +1422,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1417,17 +1420,17 @@ class RecursiveMakeBackend(CommonBackend
          pgo_objs_ref = ' \\\n    '.join(os.path.relpath(o, obj.objdir)
                                          for o in profile_gen_objs)
          # Don't bother with a list file if we're only linking objects built
@@ -2439,7 +2439,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              write_obj_deps(obj_target, objs_ref, pgo_objs_ref)
          elif not isinstance(obj, (HostLibrary, StaticLibrary)):
              list_file_path = '%s.list' % obj.name.replace('.', '_')
-@@ -1657,17 +1660,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1652,17 +1655,17 @@ class RecursiveMakeBackend(CommonBackend
          ]
          rule.add_commands(['$(call py_action,buildlist,%s)' % ' '.join(args)])
          fragment.dump(backend_file.fh, removal_guard=False)
@@ -2458,7 +2458,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
      def _write_master_test_manifest(self, path, manifests):
          with self._write_file(path) as master:
              master.write(
-@@ -1694,17 +1697,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1689,17 +1692,17 @@ class RecursiveMakeBackend(CommonBackend
          When the stub argument is True, no source file is used, and a stub
          makefile with the default header and footer only is created.
          '''
@@ -2477,7 +2477,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              pp.handleLine(b'VPATH := @srcdir@\n')
              pp.handleLine(b'relativesrcdir := @relativesrcdir@\n')
              pp.handleLine(b'include $(DEPTH)/config/@autoconfmk@\n')
-@@ -1738,37 +1741,37 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1733,37 +1736,37 @@ class RecursiveMakeBackend(CommonBackend
          for source in sorted_nonstatic_ipdl_sources:
              basename = os.path.basename(source)
              sorted_nonstatic_ipdl_basenames.append(basename)
@@ -2519,7 +2519,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          # We pass WebIDL info to make via a completely generated make file.
          mk = Makefile()
          mk.add_statement('nonstatic_webidl_files := %s' % ' '.join(
-@@ -1789,18 +1792,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1784,18 +1787,18 @@ class RecursiveMakeBackend(CommonBackend
              rule = mk.create_rule([basename])
              rule.add_dependencies([source, '$(GLOBAL_DEPS)'])
              rule.add_commands([
@@ -3075,7 +3075,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
              strings.
          srcdir -- If True, invoke make from the source directory tree.
              Otherwise, make will be invoked from the object directory.
-@@ -783,21 +788,21 @@ class MozbuildObject(ProcessExecutionMix
+@@ -785,21 +790,21 @@ class MozbuildObject(ProcessExecutionMix
              result, xcode_lisense_error_tmp = validate_make(make)
              if result:
                  return [make]
@@ -3099,7 +3099,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
  
      def _run_command_in_objdir(self, **args):
          return self.run_process(cwd=self.topobjdir, **args)
-@@ -812,32 +817,32 @@ class MozbuildObject(ProcessExecutionMix
+@@ -814,32 +819,32 @@ class MozbuildObject(ProcessExecutionMix
          """Create a new MozbuildObject-derived class instance from ourselves.
  
          This is used as a convenience method to create other
@@ -3135,7 +3135,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
              raise Exception('Pipfile not found: %s.' % pipfile)
          self.ensure_pipenv()
          self.virtualenv_manager.activate_pipenv(pipfile, populate, python)
-@@ -853,59 +858,59 @@ class MachCommandBase(MozbuildObject):
+@@ -855,59 +860,59 @@ class MachCommandBase(MozbuildObject):
      def __init__(self, context):
          # Attempt to discover topobjdir through environment detection, as it is
          # more reliable than mozconfig when cwd is inside an objdir.
@@ -4682,7 +4682,7 @@ diff --git a/python/mozbuild/mozbuild/dotproperties.py b/python/mozbuild/mozbuil
 diff --git a/python/mozbuild/mozbuild/faster_daemon.py b/python/mozbuild/mozbuild/faster_daemon.py
 --- a/python/mozbuild/mozbuild/faster_daemon.py
 +++ b/python/mozbuild/mozbuild/faster_daemon.py
-@@ -102,18 +102,18 @@ class Daemon(object):
+@@ -103,18 +103,18 @@ class Daemon(object):
                  'allof',
                  ['type', 'f'],
                  ['not',
@@ -6388,7 +6388,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
          # when we don't have a compile environment. The required
          # config keys won't be available, but the instance variables
          # that we don't set should never be accessed by the actual
-@@ -865,18 +870,18 @@ class TestManifest(ContextDerived):
+@@ -878,18 +883,18 @@ class TestManifest(ContextDerived):
          'source_relpaths',
  
          # If this manifest is a duplicate of another one, this is the
@@ -6409,7 +6409,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
          self.directory = mozpath.dirname(path)
          self.manifest = manifest
          self.flavor = flavor
-@@ -1009,17 +1014,17 @@ class UnifiedSources(BaseSources):
+@@ -1022,17 +1027,17 @@ class UnifiedSources(BaseSources):
              # On Windows, path names have a maximum length of 255 characters,
              # so avoid creating extremely long path names.
              unified_prefix = context.relsrcdir
@@ -6428,7 +6428,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
  
  class InstallationTarget(ContextDerived):
      """Describes the rules that affect where files get installed to."""
-@@ -1073,16 +1078,17 @@ class FinalTargetPreprocessedFiles(Conte
+@@ -1086,16 +1091,17 @@ class FinalTargetPreprocessedFiles(Conte
      FINAL_TARGET_PP_FILES.
      """
      __slots__ = ('files')
@@ -8509,7 +8509,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              'gkrust-gtest': 'toolkit/library/gtest/rust',
              'js': 'js/rust',
              'mozjs_sys': 'js/src',
-@@ -325,40 +325,42 @@ class CargoProvider(MachCommandBase):
+@@ -324,40 +324,42 @@ class CargoProvider(MachCommandBase):
              ret = self._run_make(srcdir=False, directory=root,
                                   ensure_exit_code=0, silent=True,
                                   print_directory=False, target=check_targets)
@@ -8557,7 +8557,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          Sometimes it is necessary to clean up these files in order to make
          things work again. This command can be used to perform that cleanup.
  
-@@ -382,20 +384,20 @@ class Clobber(MachCommandBase):
+@@ -381,20 +383,20 @@ class Clobber(MachCommandBase):
  
          ret = 0
          if 'objdir' in what:
@@ -8581,7 +8581,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
                  cmd = ['hg', 'purge', '--all', '-I', 'glob:**.py[cdo]',
                         '-I', 'path:python/', '-I', 'path:third_party/python/']
              elif conditions.is_git(self):
-@@ -411,26 +413,27 @@ class Clobber(MachCommandBase):
+@@ -410,26 +412,27 @@ class Clobber(MachCommandBase):
  
      @property
      def substs(self):
@@ -8612,7 +8612,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          if os.isatty(sys.stdout.fileno()):
              env = dict(os.environ)
              if 'LESS' not in env:
-@@ -492,52 +495,52 @@ class Warnings(MachCommandBase):
+@@ -491,52 +494,52 @@ class Warnings(MachCommandBase):
          database = WarningsDatabase()
  
          if os.path.exists(path):
@@ -8675,7 +8675,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          topsrcdir = mozpath.normpath(self.topsrcdir)
  
          if directory:
-@@ -559,53 +562,52 @@ class Warnings(MachCommandBase):
+@@ -558,53 +561,52 @@ class Warnings(MachCommandBase):
              if directory and not filename.startswith(directory):
                  continue
  
@@ -8742,7 +8742,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              config = self.config_environment
          except Exception:
              print("Please run |./mach build| before |./mach gtest|.")
-@@ -623,17 +625,17 @@ class GTestCommands(MachCommandBase):
+@@ -622,17 +624,17 @@ class GTestCommands(MachCommandBase):
              print("Could not build xul-gtest")
              return res
  
@@ -8761,7 +8761,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
  
          if not os.path.isdir(cwd):
              os.makedirs(cwd)
-@@ -665,30 +667,32 @@ class GTestCommands(MachCommandBase):
+@@ -664,30 +666,32 @@ class GTestCommands(MachCommandBase):
              return self.run_process(args=args,
                                      append_env=gtest_env,
                                      cwd=cwd,
@@ -8798,7 +8798,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              if status:
                  exit_code = status
  
-@@ -732,20 +736,21 @@ class GTestCommands(MachCommandBase):
+@@ -731,20 +735,21 @@ class GTestCommands(MachCommandBase):
                  print("The --debugger_args you passed require a real shell to parse them.")
                  print("(We can't handle the %r character.)" % e.char)
                  return 1
@@ -8821,7 +8821,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          def on_line(line):
              elements = [s.strip() for s in line.split('=', 1)]
  
-@@ -790,105 +795,106 @@ class ClangCommands(MachCommandBase):
+@@ -789,105 +794,106 @@ class ClangCommands(MachCommandBase):
          print('-I%s/ipc/ipdl/_ipdlheaders' % self.topobjdir)
  
  
@@ -8956,7 +8956,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
                  return 1
              from mozrunner.devices.android_device import verify_android_device, run_firefox_for_android
              if not (debug or debugger or debugger_args):
-@@ -899,33 +905,33 @@ class RunProgram(MachCommandBase):
+@@ -898,33 +904,33 @@ class RunProgram(MachCommandBase):
  
          else:
              from mozprofile import Profile, Preferences
@@ -8993,7 +8993,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              if params:
                  args.extend(params)
  
-@@ -1019,31 +1025,33 @@ class RunProgram(MachCommandBase):
+@@ -1018,31 +1024,33 @@ class RunProgram(MachCommandBase):
                  dmd_params.append('--show-dump-stats=yes')
  
              if dmd_params:
@@ -9030,7 +9030,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              'DEPTH': ('@DEPTH@',),
              'topsrcdir': ('@top_srcdir@',),
              'srcdir': ('@srcdir@',),
-@@ -1073,40 +1081,41 @@ class Makefiles(MachCommandBase):
+@@ -1072,40 +1080,41 @@ class Makefiles(MachCommandBase):
                      return False
  
              return True
@@ -9078,7 +9078,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              # and the content hasn't changed.
              from mozbuild.util import FileAvoidWrite
              with FileAvoidWrite(output) as out:
-@@ -1161,16 +1170,17 @@ class MachDebug(MachCommandBase):
+@@ -1160,16 +1169,17 @@ class MachDebug(MachCommandBase):
                      print('\t%s: %s' % (k, config.substs[k]), file=out)
  
                  print('config defines:', file=out)
@@ -9096,7 +9096,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
                          'topobjdir': obj.topobjdir,
                          'mozconfig': obj.mozconfig,
                      }
-@@ -1192,33 +1202,33 @@ class ArtifactSubCommand(SubCommand):
+@@ -1191,33 +1201,33 @@ class ArtifactSubCommand(SubCommand):
              'linux',
              'linux64',
              'macosx64',
@@ -9134,7 +9134,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          artifacts from Mozilla automation, replacing whatever may be in your
          object directory.  Use |mach artifact last| to see what binary artifacts
          were last used.
-@@ -1243,69 +1253,69 @@ class PackageFrontend(MachCommandBase):
+@@ -1242,69 +1252,69 @@ class PackageFrontend(MachCommandBase):
          from mozbuild.artifacts import Artifacts
          artifacts = Artifacts(tree, self.substs, self.defines, job,
                                log=self.log, cache_dir=cache_dir,
@@ -9229,7 +9229,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              open_manifest,
              unpack_file,
          )
-@@ -1389,17 +1399,17 @@ class PackageFrontend(MachCommandBase):
+@@ -1388,17 +1398,17 @@ class PackageFrontend(MachCommandBase):
                          except Exception:
                              pass
                  for algorithm, digest in (data.get('artifacts', {})
@@ -9248,7 +9248,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          records = OrderedDict()
          downloaded = []
  
-@@ -1569,16 +1579,17 @@ class PackageFrontend(MachCommandBase):
+@@ -1568,16 +1578,17 @@ class PackageFrontend(MachCommandBase):
  
          if artifacts:
              ensureParentDir(artifact_manifest)
@@ -9266,7 +9266,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
                              help='Print verbose output.'),
          ]
          for arg in args:
-@@ -1727,17 +1738,18 @@ class StaticAnalysis(MachCommandBase):
+@@ -1726,17 +1737,18 @@ class StaticAnalysis(MachCommandBase):
          self._clang_tidy_config = self._get_clang_tidy_config()
          args = self._get_clang_tidy_command(
              checks=checks, header_filter=header_filter, sources=source, jobs=jobs, fix=fix)
@@ -9286,7 +9286,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              # Write output file
              if output is not None:
                  output_manager.write(output, format)
-@@ -1897,17 +1909,17 @@ class StaticAnalysis(MachCommandBase):
+@@ -1896,17 +1908,17 @@ class StaticAnalysis(MachCommandBase):
                         '-checks=%s' % checks,
                         '-extra-arg=-DMOZ_CLANG_PLUGIN']
  
@@ -9305,7 +9305,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          if cfg:
              common_args += ['-config=%s' % yaml.dump(cfg)]
  
-@@ -2018,17 +2030,18 @@ class StaticAnalysis(MachCommandBase):
+@@ -2017,17 +2029,18 @@ class StaticAnalysis(MachCommandBase):
                  # 1. Checker attribute 'publish' is False.
                  not_published = not bool(item.get('publish', True))
                  # 2. Checker has restricted-platforms and current platform is not of them.
@@ -9325,7 +9325,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
                  checkers_test_batch.append(item['name'])
                  futures.append(executor.submit(self._verify_checker, item))
  
-@@ -2332,17 +2345,17 @@ class StaticAnalysis(MachCommandBase):
+@@ -2331,17 +2344,17 @@ class StaticAnalysis(MachCommandBase):
          checks = '-*'
          try:
              config = self._clang_tidy_config
@@ -9344,7 +9344,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          config_list = []
          checker_config = {}
          try:
-@@ -2356,17 +2369,17 @@ class StaticAnalysis(MachCommandBase):
+@@ -2355,17 +2368,17 @@ class StaticAnalysis(MachCommandBase):
                          # 2. Option -> that will become CheckerName.Option
                          if not checker_option['key'].startswith(checker['name']):
                              checker_option['key'] = "{}.{}".format(
@@ -9363,7 +9363,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          ran_configure = False
          config = None
          builder = Build(self._mach_context)
-@@ -2802,48 +2815,48 @@ class Vendor(MachCommandBase):
+@@ -2801,48 +2814,48 @@ class Vendor(MachCommandBase):
               description='Vendor third-party dependencies into the source repository.')
      def vendor(self):
          self.parser.print_usage()
@@ -9424,7 +9424,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
      @SubCommand('vendor', 'python',
                  description='Vendor Python packages from pypi.org into third_party/python')
      @CommandArgument('--with-windows-wheel', action='store_true',
-@@ -2862,31 +2875,32 @@ class Vendor(MachCommandBase):
+@@ -2861,31 +2874,32 @@ class Vendor(MachCommandBase):
                       help='Manifest files to work on')
      @CommandArgumentGroup('verify')
      @CommandArgument('--verify', '-v', action='store_true', group='verify',
@@ -9464,7 +9464,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
          if debug or debugger or debugger_args:
              args = self.prepend_debugger_args(args, debugger, debugger_args)
  
-@@ -2924,69 +2938,69 @@ class Repackage(MachCommandBase):
+@@ -2923,69 +2937,69 @@ class Repackage(MachCommandBase):
      @Command('repackage', category='misc',
               description='Repackage artifacts into different formats.')
      def repackage(self):
@@ -10714,7 +10714,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
      def test_generated_files(self):
          """Ensure GENERATED_FILES is handled properly."""
          env = self._consume('generated-files', RecursiveMakeBackend)
-@@ -559,17 +561,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -562,17 +564,17 @@ class TestRecursiveMakeBackend(BackendTe
  
      def test_exports_generated(self):
          """Ensure EXPORTS that are listed in GENERATED_FILES
@@ -10733,7 +10733,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertIn('bar.h', m)
          self.assertIn('mozilla/mozilla2.h', m)
          self.assertIn('mozilla/dom/dom2.h', m)
-@@ -597,17 +599,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -600,17 +602,17 @@ class TestRecursiveMakeBackend(BackendTe
          self.assertEqual(lines, expected)
  
      def test_resources(self):
@@ -10752,7 +10752,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertIn('res/bar.res.in', m)
          self.assertIn('res/tests/test.manifest', m)
          self.assertIn('res/tests/extra.manifest', m)
-@@ -629,17 +631,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -632,17 +634,17 @@ class TestRecursiveMakeBackend(BackendTe
              '[include:dir1/xpcshell.ini]',
              '[include:xpcshell.ini]',
          ])
@@ -10771,7 +10771,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertIn('support/**', entries[0])
  
      def test_test_manifest_deffered_installs_written(self):
-@@ -682,17 +684,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -685,17 +687,17 @@ class TestRecursiveMakeBackend(BackendTe
              self.assertEqual(info, m._dests[item])
  
      def test_xpidl_generation(self):
@@ -10790,7 +10790,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertIn('bar.idl', m)
          self.assertIn('foo.idl', m)
  
-@@ -709,17 +711,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -712,17 +714,17 @@ class TestRecursiveMakeBackend(BackendTe
          p = mozpath.join(env.topobjdir, 'config/makefiles/xpidl')
          self.assertTrue(os.path.isdir(p))
  
@@ -10809,7 +10809,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
  
      def test_old_install_manifest_deleted(self):
          # Simulate an install manifest from a previous backend version. Ensure
-@@ -771,17 +773,18 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -774,17 +776,18 @@ class TestRecursiveMakeBackend(BackendTe
  
          manifest_path = mozpath.join(env.topobjdir, 'ipdlsrcs.mk')
          lines = [l.strip() for l in open(manifest_path, 'rt').readlines()]
@@ -10829,7 +10829,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
                                                           'CPPSRCS',
                                                           'IPDLDIRS'))]
          self.assertEqual(found, expected)
-@@ -948,18 +951,18 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -951,18 +954,18 @@ class TestRecursiveMakeBackend(BackendTe
          ]
          expected[mozpath.join(env.topobjdir, 'final-target')] = [
              'FINAL_TARGET = $(DEPTH)/random-final-target'
@@ -10850,7 +10850,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
  
          backend_path = mozpath.join(env.topobjdir, 'backend.mk')
          lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
-@@ -1148,17 +1151,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -1151,17 +1154,17 @@ class TestRecursiveMakeBackend(BackendTe
  
          lines = [line.rstrip() for line in lines]
  
@@ -15130,7 +15130,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
              # Default if this tree isn't configured.
              import which
              return which.which('cargo')
-@@ -57,17 +58,18 @@ class VendorRust(MozbuildObject):
+@@ -56,17 +57,18 @@ class VendorRust(MozbuildObject):
  
      def check_modified_files(self):
          '''
@@ -15150,7 +15150,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
  
  Please commit or stash these changes before vendoring, or re-run with `--ignore-modified`.
  '''.format(files='\n'.join(sorted(modified))))
-@@ -231,25 +233,25 @@ Please commit or stash these changes bef
+@@ -228,25 +230,25 @@ Please commit or stash these changes bef
  
          def verify_acceptable_license(package, license):
              self.log(logging.DEBUG, 'package_license', {},
@@ -15178,7 +15178,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
      '''.format(package, license))
                      return False
  
-@@ -259,18 +261,20 @@ Please commit or stash these changes bef
+@@ -256,18 +258,20 @@ Please commit or stash these changes bef
  
              toml_file = os.path.join(vendor_dir, package, 'Cargo.toml')
  
@@ -15201,7 +15201,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
                               'package {} does not provide a license'.format(package))
                      return False
  
-@@ -296,33 +300,35 @@ Please commit or stash these changes bef
+@@ -293,33 +297,35 @@ Please commit or stash these changes bef
                                   '''Package {} has an unreviewed license file: {}.
  
  Please request review on the provided license; if approved, the package can be added
@@ -15239,7 +15239,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
          self.log_manager.enable_unstructured()
          if not ignore_modified:
              self.check_modified_files()
-@@ -333,17 +339,18 @@ license file's hash.
+@@ -330,17 +336,18 @@ license file's hash.
  
          relative_vendor_dir = 'third_party/rust'
          vendor_dir = mozpath.join(self.topsrcdir, relative_vendor_dir)

mozilla-release/patches/1542963-3-69a1.patch

@@ -2,7 +2,7 @@
 # User Justin Wood <Callek@gmail.com>
 # Date 1559053340 0
 # Node ID bf11356a308cd40eb03f84ddfcd295247ff336c1
-# Parent  29338285ed2ee362b463ab3d2d2824247fa3b5f3
+# Parent  71fff38a3be8b8aa48fceb90926c006a8528b49b
 Bug 1542963 - Fix most flake8 issues in python/mozbuild/mozbuild/* r=firefox-build-system-reviewers,chmanchester
 
 Leaving one fix for an explicit review.
@@ -14,7 +14,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D26641
 diff --git a/.flake8 b/.flake8
 --- a/.flake8
 +++ b/.flake8
-@@ -83,11 +83,13 @@ ignore =
+@@ -84,11 +84,13 @@ ignore =
      F632, F633, F811, E117, W504, W605, W606,
      # These are intentionally disabled (not necessarily for good reason).
      #   F723: syntax error in type comment
@@ -540,7 +540,7 @@ diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/ar
 diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
 --- a/python/mozbuild/mozbuild/backend/common.py
 +++ b/python/mozbuild/mozbuild/backend/common.py
-@@ -26,17 +26,16 @@ from mozbuild.frontend.data import (
+@@ -25,17 +25,16 @@ from mozbuild.frontend.data import (
      Exports,
      FinalTargetPreprocessedFiles,
      FinalTargetFiles,
@@ -558,7 +558,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
      StaticLibrary,
      UnifiedSources,
      XPIDLFile,
-@@ -45,17 +44,16 @@ from mozbuild.frontend.data import (
+@@ -44,17 +43,16 @@ from mozbuild.frontend.data import (
  from mozbuild.jar import (
      DeprecatedJarManifest,
      JarManifestParser,
@@ -576,7 +576,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
      """Helps manage XPCOM IDLs in the context of the build system."""
      def __init__(self, config):
          self.config = config
-@@ -191,17 +189,19 @@ class CommonBackend(BuildBackend):
+@@ -189,17 +187,19 @@ class CommonBackend(BuildBackend):
          else:
              return False
  
@@ -1008,7 +1008,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              for d in self.traverse(dir, filter):
                  yield d
  
-@@ -599,35 +597,40 @@ class RecursiveMakeBackend(CommonBackend
+@@ -595,35 +593,40 @@ class RecursiveMakeBackend(CommonBackend
                          # handling.
                          backend_file.write('%s:: %s\n' % (tier, stub_file))
                  for output in outputs:
@@ -1053,7 +1053,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          elif isinstance(obj, RustProgram):
              self._process_rust_program(obj, backend_file)
              # Hook the program into the compile graph.
-@@ -890,19 +893,20 @@ class RecursiveMakeBackend(CommonBackend
+@@ -886,19 +889,20 @@ class RecursiveMakeBackend(CommonBackend
              "# compilation times and debug information size."
          makefile.add_statement(explanation)
  
@@ -1077,7 +1077,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
      def _check_blacklisted_variables(self, makefile_in, makefile_content):
          if b'EXTERNALLY_MANAGED_MAKE_FILE' in makefile_content:
-@@ -1056,20 +1060,20 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1052,20 +1056,20 @@ class RecursiveMakeBackend(CommonBackend
      def _process_directory_traversal(self, obj, backend_file):
          """Process a data.DirectoryTraversal instance."""
          fh = backend_file.fh
@@ -1102,7 +1102,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
      def _process_defines(self, obj, backend_file, which='DEFINES'):
          """Output the DEFINES rules to the given backend file."""
          defines = list(obj.get_defines())
-@@ -1084,17 +1088,19 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1080,17 +1084,19 @@ class RecursiveMakeBackend(CommonBackend
          if obj.xpiname:
              backend_file.write('XPI_NAME = %s\n' % (obj.xpiname))
          if obj.subdir:
@@ -1123,7 +1123,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
          build_files = self._install_manifests['xpidl']
  
          for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done'):
-@@ -1102,18 +1108,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1098,18 +1104,17 @@ class RecursiveMakeBackend(CommonBackend
  
          for idl in manager.idls.values():
              self._install_manifests['dist_idl'].add_link(idl['source'],
@@ -1143,7 +1143,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
          mk = Makefile()
  
-@@ -1310,18 +1315,19 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1306,18 +1311,19 @@ class RecursiveMakeBackend(CommonBackend
  
      def _process_per_source_flag(self, per_source_flag, backend_file):
          for flag in per_source_flag.flags:
@@ -1165,7 +1165,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
      def _process_shared_library(self, libdef, backend_file):
          backend_file.write_once('LIBRARY_NAME := %s\n' % libdef.basename)
          backend_file.write('FORCE_SHARED_LIB := 1\n')
-@@ -1374,17 +1380,16 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1372,17 +1378,16 @@ class RecursiveMakeBackend(CommonBackend
          return '%s/%s' % (mozpath.relpath(obj.objdir,
                                            self.environment.topobjdir), target_name)
  
@@ -1183,7 +1183,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
  
          obj_target = obj.name
          if isinstance(obj, Program):
-@@ -1525,18 +1530,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1523,18 +1528,18 @@ class RecursiveMakeBackend(CommonBackend
              for f in files:
                  assert not isinstance(f, RenamedSourcePath)
                  dest = mozpath.join(reltarget, path, f.target_basename)
@@ -1204,7 +1204,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
                          install_manifest.add_link(f.full_path, dest)
                  else:
                      install_manifest.add_optional_exists(dest)
-@@ -1748,18 +1753,19 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1746,18 +1751,19 @@ class RecursiveMakeBackend(CommonBackend
  
          mk.add_statement('ALL_IPDLSRCS := %s %s' % (' '.join(sorted_nonstatic_ipdl_basenames),
                                                      ' '.join(sorted_static_ipdl_sources)))
@@ -1429,7 +1429,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
          os.makedirs(self.statedir)
  
      def _ensure_state_subdir_exists(self, subdir):
-@@ -860,18 +862,19 @@ class MachCommandBase(MozbuildObject):
+@@ -862,18 +864,19 @@ class MachCommandBase(MozbuildObject):
          # more reliable than mozconfig when cwd is inside an objdir.
          topsrcdir = context.topdir
          topobjdir = None
@@ -2027,7 +2027,7 @@ diff --git a/python/mozbuild/mozbuild/faster_daemon.py b/python/mozbuild/mozbuil
 diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -1217,77 +1217,113 @@ SUBCONTEXTS = {cls.__name__: cls for cls
+@@ -1206,77 +1206,113 @@ SUBCONTEXTS = {cls.__name__: cls for cls
  
  # This defines the set of mutable global variables.
  #
@@ -2178,7 +2178,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
          If the optional ``script`` attribute is not present on an entry, it
          is assumed that rules for generating the file are present in
          the associated Makefile.in.
-@@ -1325,20 +1361,23 @@ VARIABLES = {
+@@ -1314,20 +1350,23 @@ VARIABLES = {
  
          When the ``flags`` attribute is present, the given list of flags is
          passed as extra arguments following the inputs.
@@ -2206,7 +2206,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
          a string-literal in the program, the value needs to have
          double-quotes.
  
-@@ -1353,54 +1392,64 @@ VARIABLES = {
+@@ -1342,54 +1381,64 @@ VARIABLES = {
          respectively. These could also be combined into a single
          update::
  
@@ -2284,7 +2284,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
          the contents of its files to the directory specified by
          ``FINAL_TARGET`` (typically ``dist/bin``). Files that are destined for a
          subdirectory can be specified by accessing a field, or as a dict access.
-@@ -1697,33 +1746,45 @@ VARIABLES = {
+@@ -1686,33 +1735,45 @@ VARIABLES = {
  
      'HOST_RUST_PROGRAMS': (StrictOrderingOnAppendList, list,
                             """Compile a list of Rust executable names.
@@ -2337,7 +2337,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
          ``dist/include``, but it can be used for other files as well. This variable
          behaves as a list when appending filenames for export in the top-level
          directory. Files can also be appended to a field to indicate which
-@@ -2442,33 +2503,41 @@ SPECIAL_VARIABLES = {
+@@ -2431,33 +2492,41 @@ SPECIAL_VARIABLES = {
  
      'EXTRA_COMPONENTS': (lambda context: context['FINAL_TARGET_FILES'].components._strings, list,
                           """Additional component files to distribute.
@@ -2436,7 +2436,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
  
      @property
      def name(self):
-@@ -1015,20 +1015,22 @@ class UnifiedSources(BaseSources):
+@@ -1028,20 +1028,22 @@ class UnifiedSources(BaseSources):
              # so avoid creating extremely long path names.
              unified_prefix = context.relsrcdir
              if len(unified_prefix) > 20:
@@ -3923,9 +3923,9 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
  )
  from mozunit import main
  
-@@ -402,17 +401,17 @@ class TestRecursiveMakeBackend(BackendTe
- 
+@@ -403,27 +402,27 @@ class TestRecursiveMakeBackend(BackendTe
          expected = [
+             'export:: $(MDDEPDIR)/bar.c.stub',
              'bar.c: $(MDDEPDIR)/bar.c.stub ;',
              'GARBAGE += bar.c',
              'GARBAGE += $(MDDEPDIR)/bar.c.stub',
@@ -3936,15 +3936,26 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
 +            '$(call py_action,file_generate,%s/generate-bar.py baz bar.c $(MDDEPDIR)/bar.c.pp $(MDDEPDIR)/bar.c.stub)' % env.topsrcdir,  # noqa
              '@$(TOUCH) $@',
              '',
-             'export:: $(MDDEPDIR)/foo.h.stub',
-             'foo.h: $(MDDEPDIR)/foo.h.stub ;',
-             'GARBAGE += foo.h',
-             'GARBAGE += $(MDDEPDIR)/foo.h.stub',
-             'EXTRA_MDDEPEND_FILES += foo.h.pp',
-             '$(MDDEPDIR)/foo.h.stub: %s/generate-foo.py $(srcdir)/foo-data' % (env.topsrcdir),
-@@ -434,26 +433,26 @@ class TestRecursiveMakeBackend(BackendTe
+             'export:: $(MDDEPDIR)/foo.c.stub',
+             'foo.c: $(MDDEPDIR)/foo.c.stub ;',
+             'GARBAGE += foo.c',
+             'GARBAGE += $(MDDEPDIR)/foo.c.stub',
+             'EXTRA_MDDEPEND_FILES += foo.c.pp',
+             '$(MDDEPDIR)/foo.c.stub: %s/generate-foo.py $(srcdir)/foo-data' % (env.topsrcdir),
+             '$(REPORT_BUILD)',
+-            '$(call py_action,file_generate,%s/generate-foo.py main foo.c $(MDDEPDIR)/foo.c.pp $(MDDEPDIR)/foo.c.stub $(srcdir)/foo-data)' % (env.topsrcdir),
++            '$(call py_action,file_generate,%s/generate-foo.py main foo.c $(MDDEPDIR)/foo.c.pp $(MDDEPDIR)/foo.c.stub $(srcdir)/foo-data)' % (env.topsrcdir),  # noqa
+             '@$(TOUCH) $@',
+             '',
+         ]
+ 
+         self.maxDiff = None
+         self.assertEqual(lines, expected)
  
+     def test_generated_files_force(self):
+@@ -436,27 +435,27 @@ class TestRecursiveMakeBackend(BackendTe
          expected = [
+             'export:: $(MDDEPDIR)/bar.c.stub',
              'bar.c: $(MDDEPDIR)/bar.c.stub ;',
              'GARBAGE += bar.c',
              'GARBAGE += $(MDDEPDIR)/bar.c.stub',
@@ -3955,6 +3966,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
 +            '$(call py_action,file_generate,%s/generate-bar.py baz bar.c $(MDDEPDIR)/bar.c.pp $(MDDEPDIR)/bar.c.stub)' % env.topsrcdir,  # noqa
              '@$(TOUCH) $@',
              '',
+             'export:: $(MDDEPDIR)/foo.c.stub',
              'foo.c: $(MDDEPDIR)/foo.c.stub ;',
              'GARBAGE += foo.c',
              'GARBAGE += $(MDDEPDIR)/foo.c.stub',
@@ -3971,7 +3983,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertEqual(lines, expected)
  
      def test_localized_generated_files(self):
-@@ -464,19 +463,19 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -467,19 +466,19 @@ class TestRecursiveMakeBackend(BackendTe
          lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
  
          expected = [
@@ -3993,7 +4005,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
              'INSTALL_TARGETS += LOCALIZED_FILES_0',
          ]
  
-@@ -491,29 +490,29 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -494,29 +493,29 @@ class TestRecursiveMakeBackend(BackendTe
          lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
  
          expected = [
@@ -4027,7 +4039,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertEqual(lines, expected)
  
      def test_localized_generated_files_AB_CD(self):
-@@ -525,38 +524,38 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -528,38 +527,38 @@ class TestRecursiveMakeBackend(BackendTe
          lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
  
          expected = [
@@ -4072,7 +4084,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          self.assertEqual(lines, expected)
  
      def test_exports_generated(self):
-@@ -756,35 +755,35 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -759,35 +758,35 @@ class TestRecursiveMakeBackend(BackendTe
          for e in expected:
              full = mozpath.join(man_dir, e)
              self.assertTrue(os.path.exists(full))
@@ -4111,7 +4123,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
                                                           'CPPSRCS',
                                                           'IPDLDIRS'))]
          self.assertEqual(found, expected)
-@@ -819,18 +818,16 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -822,18 +821,16 @@ class TestRecursiveMakeBackend(BackendTe
  
      def test_generated_includes(self):
          """Test that GENERATED_INCLUDES are written to backend.mk correctly."""
@@ -4130,7 +4142,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
          found = [str for str in lines if str.startswith('LOCAL_INCLUDES')]
          self.assertEqual(found, expected)
  
-@@ -928,17 +925,17 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -931,17 +928,17 @@ class TestRecursiveMakeBackend(BackendTe
          lines = [l.strip() for l in open(root_deps_path, 'rt').readlines()]
  
          self.assertTrue(any(l == 'recurse_compile: code/target code/host' for l in lines))
@@ -4573,7 +4585,7 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
  
  data_path = mozpath.abspath(mozpath.dirname(__file__))
  data_path = mozpath.join(data_path, 'data')
-@@ -520,28 +517,32 @@ class TestEmitterBasic(unittest.TestCase
+@@ -528,28 +525,32 @@ class TestEmitterBasic(unittest.TestCase
          self.assertIsInstance(objs[0], GeneratedFile)
          self.assertIsInstance(objs[1], LocalizedFiles)
  
@@ -4612,7 +4624,7 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
          self.assertEqual(len(objs), 2)
          for o in objs:
              self.assertIsInstance(o, GeneratedFile)
-@@ -735,18 +736,21 @@ class TestEmitterBasic(unittest.TestCase
+@@ -743,18 +744,21 @@ class TestEmitterBasic(unittest.TestCase
              self.read_topsrcdir(reader)
  
      def test_test_manifest_dupe_support_files(self):
@@ -4636,7 +4648,7 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
  
          objs = self.read_topsrcdir(reader)
          self.assertEqual(len(objs), 1)
-@@ -1043,34 +1047,34 @@ class TestEmitterBasic(unittest.TestCase
+@@ -1051,34 +1055,34 @@ class TestEmitterBasic(unittest.TestCase
      def test_local_includes_invalid(self):
          """Test that invalid LOCAL_INCLUDES are properly detected."""
          reader = self.reader('local_includes-invalid/srcdir')
@@ -4674,7 +4686,7 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
  
          generated_includes = [o.path for o in objs if isinstance(o, LocalInclude)]
          expected = [
-@@ -1400,18 +1404,20 @@ class TestEmitterBasic(unittest.TestCase
+@@ -1408,18 +1412,20 @@ class TestEmitterBasic(unittest.TestCase
          with self.assertRaisesRegexp(SandboxValidationError, 'File listed in '
                                       'FINAL_TARGET_PP_FILES does not exist'):
              reader = self.reader('dist-files-missing')
@@ -4697,7 +4709,7 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
          objs = self.read_topsrcdir(reader)
  
          self.assertEqual(len(objs), 1)
-@@ -1424,19 +1430,21 @@ class TestEmitterBasic(unittest.TestCase
+@@ -1432,19 +1438,21 @@ class TestEmitterBasic(unittest.TestCase
              expected = {'en-US/bar.ini', 'en-US/code/*.js', 'en-US/foo.js'}
              for f in files:
                  self.assertTrue(unicode(f) in expected)
@@ -4722,7 +4734,7 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
  
          self.assertEqual(len(objs), 1)
          self.assertIsInstance(objs[0], LocalizedPreprocessedFiles)
-@@ -1645,15 +1653,17 @@ class TestEmitterBasic(unittest.TestCase
+@@ -1653,15 +1661,17 @@ class TestEmitterBasic(unittest.TestCase
          self.assertIsInstance(shlib, SharedLibrary)
          self.assertEqual(shlib.symbols_file, 'foo.symbols')
  
@@ -5258,7 +5270,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
  
          return cargo
  
-@@ -334,25 +337,27 @@ license file's hash.
+@@ -333,25 +336,27 @@ license file's hash.
          cargo = self._ensure_cargo()
          if not cargo:
              return
@@ -5289,7 +5301,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
          FILESIZE_LIMIT = 100 * 1024
          large_files = set()
          cumulative_added_size = 0
-@@ -384,9 +389,11 @@ The changes from `mach vendor rust` will
+@@ -383,9 +388,11 @@ The changes from `mach vendor rust` will
          SIZE_WARN_THRESHOLD = 5 * 1024 * 1024
          if cumulative_added_size >= SIZE_WARN_THRESHOLD:
              self.log(logging.WARN, 'filesize_check', {},

mozilla-release/patches/1542963-6-69a1.patch

@@ -2,7 +2,7 @@
 # User Justin Wood <Callek@gmail.com>
 # Date 1559053380 0
 # Node ID 1b57b9bd743554516ffac1ce3f65326a0059e0fd
-# Parent  c8aaf007d23874605e080d89cba6731298951594
+# Parent  6a6254067ad57b66d26e953d43f6a6791f55a4d5
 Bug 1542963 - use print_function for mozbuild and mozpack. r=glandium
 
 Lint python/mozbuild/{mozbuild,mozpack}.
@@ -410,13 +410,13 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
 -from __future__ import absolute_import, unicode_literals
 +from __future__ import absolute_import, print_function, unicode_literals
  
- import itertools
  import json
  import os
  
  import mozpack.path as mozpath
  
  from mozbuild.backend.base import BuildBackend
+ 
 diff --git a/python/mozbuild/mozbuild/backend/configenvironment.py b/python/mozbuild/mozbuild/backend/configenvironment.py
 --- a/python/mozbuild/mozbuild/backend/configenvironment.py
 +++ b/python/mozbuild/mozbuild/backend/configenvironment.py

mozilla-release/patches/1551639-2-69a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1559795700 0
 # Node ID 77a5c54083fa748a42f0c88d9817057a39df6d62
-# Parent  3bffa313ec17151c21206219971683f11d5443e8
+# Parent  83cf1c4e42bc762c7452f073f0aa3dcac4bc3871
 Bug 1551639 - Don't build generated source files during the export tier. r=nalexander
 
 As established previously, generated source files that are not included
@@ -18,7 +18,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
  # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
- from __future__ import absolute_import, unicode_literals
+ from __future__ import absolute_import, print_function, unicode_literals
  
 +import itertools
  import json
@@ -29,7 +29,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
  from mozbuild.backend.base import BuildBackend
  
  from mozbuild.frontend.context import (
-@@ -159,18 +160,19 @@ class CommonBackend(BuildBackend):
+@@ -161,18 +162,19 @@ class CommonBackend(BuildBackend):
              self._binaries.shared_libraries.append(obj)
              return False
  
@@ -48,13 +48,13 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
              return False
  
          elif isinstance(obj, Exports):
-             objdir_files = [f.full_path for path, files in obj.files.walk() for f in files if isinstance(f, ObjDirPath)]
+             objdir_files = [f.full_path for path, files in obj.files.walk()
+                             for f in files if isinstance(f, ObjDirPath)]
              if objdir_files:
-                 self._handle_generated_sources(objdir_files)
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -509,23 +509,26 @@ class RecursiveMakeBackend(CommonBackend
+@@ -511,23 +511,26 @@ class RecursiveMakeBackend(CommonBackend
                  else:
                      backend_file.write('%s := %s\n' % (k, v))
          elif isinstance(obj, HostDefines):
@@ -83,7 +83,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              else:
                  substs = {}
              outputs = []
-@@ -576,22 +579,23 @@ class RecursiveMakeBackend(CommonBackend
+@@ -578,22 +581,23 @@ class RecursiveMakeBackend(CommonBackend
  
              force = ''
              if obj.force:
@@ -116,7 +116,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
 diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
 --- a/python/mozbuild/mozbuild/frontend/data.py
 +++ b/python/mozbuild/mozbuild/frontend/data.py
-@@ -1113,42 +1113,44 @@ class GeneratedFile(ContextDerived):
+@@ -1157,42 +1157,44 @@ class GeneratedFile(ContextDerived):
      """Represents a generated file."""
  
      __slots__ = (
@@ -187,7 +187,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/data/generated-files/moz.buil
 diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
 --- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
 +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
-@@ -391,60 +391,57 @@ class TestRecursiveMakeBackend(BackendTe
+@@ -395,60 +395,57 @@ class TestRecursiveMakeBackend(BackendTe
      def test_generated_files(self):
          """Ensure GENERATED_FILES is handled properly."""
          env = self._consume('generated-files', RecursiveMakeBackend)
@@ -203,7 +203,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
              'EXTRA_MDDEPEND_FILES += bar.c.pp',
              '$(MDDEPDIR)/bar.c.stub: %s/generate-bar.py' % env.topsrcdir,
              '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,%s/generate-bar.py baz bar.c $(MDDEPDIR)/bar.c.pp $(MDDEPDIR)/bar.c.stub)' % env.topsrcdir,
+             '$(call py_action,file_generate,%s/generate-bar.py baz bar.c $(MDDEPDIR)/bar.c.pp $(MDDEPDIR)/bar.c.stub)' % env.topsrcdir,  # noqa
              '@$(TOUCH) $@',
              '',
 -            'export:: $(MDDEPDIR)/foo.c.stub',
@@ -219,7 +219,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
 +            'EXTRA_MDDEPEND_FILES += foo.h.pp',
 +            '$(MDDEPDIR)/foo.h.stub: %s/generate-foo.py $(srcdir)/foo-data' % (env.topsrcdir),
              '$(REPORT_BUILD)',
--            '$(call py_action,file_generate,%s/generate-foo.py main foo.c $(MDDEPDIR)/foo.c.pp $(MDDEPDIR)/foo.c.stub $(srcdir)/foo-data)' % (env.topsrcdir),
+-            '$(call py_action,file_generate,%s/generate-foo.py main foo.c $(MDDEPDIR)/foo.c.pp $(MDDEPDIR)/foo.c.stub $(srcdir)/foo-data)' % (env.topsrcdir),  # noqa
 +            '$(call py_action,file_generate,%s/generate-foo.py main foo.h $(MDDEPDIR)/foo.h.pp $(MDDEPDIR)/foo.h.stub $(srcdir)/foo-data)' % (env.topsrcdir),  # noqa
              '@$(TOUCH) $@',
              '',
@@ -243,7 +243,7 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
              'EXTRA_MDDEPEND_FILES += bar.c.pp',
              '$(MDDEPDIR)/bar.c.stub: %s/generate-bar.py FORCE' % env.topsrcdir,
              '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,%s/generate-bar.py baz bar.c $(MDDEPDIR)/bar.c.pp $(MDDEPDIR)/bar.c.stub)' % env.topsrcdir,
+             '$(call py_action,file_generate,%s/generate-bar.py baz bar.c $(MDDEPDIR)/bar.c.pp $(MDDEPDIR)/bar.c.stub)' % env.topsrcdir,  # noqa
              '@$(TOUCH) $@',
              '',
 -            'export:: $(MDDEPDIR)/foo.c.stub',
@@ -253,5 +253,5 @@ diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/pytho
              'EXTRA_MDDEPEND_FILES += foo.c.pp',
              '$(MDDEPDIR)/foo.c.stub: %s/generate-foo.py $(srcdir)/foo-data' % (env.topsrcdir),
              '$(REPORT_BUILD)',
-             '$(call py_action,file_generate,%s/generate-foo.py main foo.c $(MDDEPDIR)/foo.c.pp $(MDDEPDIR)/foo.c.stub $(srcdir)/foo-data)' % (env.topsrcdir),
+             '$(call py_action,file_generate,%s/generate-foo.py main foo.c $(MDDEPDIR)/foo.c.pp $(MDDEPDIR)/foo.c.stub $(srcdir)/foo-data)' % (env.topsrcdir),  # noqa
              '@$(TOUCH) $@',

mozilla-release/patches/1553864-69a1.patch

@@ -2,7 +2,7 @@
 # User David Major <dmajor@mozilla.com>
 # Date 1559593831 0
 # Node ID 44b86ef7a1d67ca90b6aa563ec133b70fc91c445
-# Parent  0505440d695acf21da088c470d5f6d3731595335
+# Parent  057bc8517b4d1e836f9e546346a15c494df47e93
 Bug 1553864 - Clean up some VS2015 PGO build config code r=nalexander
 
 This code was already dead during the VS2017 era (since that compiler changed to the `Hostx64\x86` path scheme), let alone clang-cl.
@@ -50,14 +50,14 @@ diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
 -                    env['PATH'] = '%s;%s' % (vcdir, env['PATH'])
 -                    break
 -
-         # Add MOZ_OBJDIR to the env so that cygprofile.cpp can use it.
-         env["MOZ_OBJDIR"] = build.topobjdir
- 
          # Run Firefox a first time to initialize its profile
          runner = FirefoxRunner(profile=profile,
                                 binary=binary,
                                 cmdargs=['data:text/html,<script>Quitter.quit()</script>'],
                                 env=env)
+         runner.start()
+         ret = runner.wait()
+         if ret:
 diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py
 --- a/toolkit/mozapps/installer/packager.py
 +++ b/toolkit/mozapps/installer/packager.py

mozilla-release/patches/1556662-69a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1559648384 0
 # Node ID 71d3424191f63751068077270a32f9f3aeb026b8
-# Parent  2a35016f0e672622a2b871d9970c7bbe28f558b9
+# Parent  590b5ea9aa8ae57750fcd3ff9c789f6acf40266c
 Bug 1556662 - Fix a typo in change from bug 1469091. r=dmajor
 
 In a branch for `isinstance(obj, (HostSources, HostGeneratedSources))`,
@@ -14,8 +14,8 @@ Differential Revision: https://phabricator.services.mozilla.com/D33603
 diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
 --- a/python/mozbuild/mozbuild/backend/recursivemake.py
 +++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -486,17 +486,17 @@ class RecursiveMakeBackend(CommonBackend
-                 backend_file.write('PGO_GEN_ONLY_CPPSRCS += %s\n' % f)
+@@ -481,17 +481,17 @@ class RecursiveMakeBackend(CommonBackend
+                     backend_file.write('%s += %s\n' % (var, f))
          elif isinstance(obj, (HostSources, HostGeneratedSources)):
              suffix_map = {
                  '.c': 'HOST_CSRCS',

mozilla-release/patches/series

@@ -5518,45 +5518,28 @@ NOBUG-removenonascii67a1-25314.patch
 1547698-2-68a1.patch
 1547698-3-68a1.patch
 1547698-4-68a1.patch
-1544881-68a1.patch
+1552627-2only-69a1.patch
+1544881-69a1.patch
+1552672-69a1.patch
+1551690-69a1.patch
+1527610-69a1.patch
+1548563-69a1.patch
+1553226-69a1.patch
+1550956-69a1.patch
 1536672-PARTIAL-69a1.patch
+1551078-69a1.patch
+1552687-69a1.patch
+1543829-69a1.patch
+1480236-PARTIAL-notests-69a1.patch
+1554115-69a1.patch
+1542746-1-PARTIAL-69a1.patch
+1542746-3no2-69a1.patch
+1519636-18-PARTIAL-hyphenation-only-69a1.patch
 1551084-1-69a1.patch
 1551084-2-69a1.patch
 1551084-3-69a1.patch
 1551084-4-69a1.patch
 1551084-5-69a1.patch
-1552627-2only-69a1.patch
-1552672-69a1.patch
-1527610-69a1.patch
-1480236-PARTIAL-notests-69a1.patch
-1543829-69a1.patch
-1519636-17-PARTIAL-hyphenation-only-69a1.patch
-1546322-69a1.patch
-1556257-69a1.patch
-1555329-69a1.patch
-1553864-69a1.patch
-1554306-69a1.patch
-1556662-69a1.patch
-1552658-69a1.patch
-1551639-1-69a1.patch
-1551639-2-69a1.patch
-1551639-3-69a1.patch
-1501277-69a1.patch
-1549386-69a1.patch
-1557229-69a1.patch
-1557291-69a1.patch
-1552121-69a1.patch
-1551844-69a1.patch
-1558883-69a1.patch
-1558737-69a1.patch
-1524194-2-69a1.patch
-1559403-1-69a1.patch
-1559403-2-69a1.patch
-1410013-69a1.patch
-1559900-69a1.patch
-1560439-69a1.patch
-1556103-1only-69a1.patch
-1551690-69a1.patch
 1547730-01-69a1.patch
 1547730-02-69a1.patch
 1547730-03-69a1.patch
@@ -5584,36 +5567,6 @@ NOBUG-removenonascii67a1-25314.patch
 1547730-26-69a1.patch
 1547730-27-69a1.patch
 1547730-28-69a1.patch
-1473498-01-69a1.patch
-1473498-02-69a1.patch
-1473498-03-69a1.patch
-1473498-04-69a1.patch
-1473498-05-69a1.patch
-1547193-69a1.patch
-1507696-69a1.patch
-1550956-69a1.patch
-1554186-69a1.patch
-1557583-1-69a1.patch
-1557583-2-69a1.patch
-1560527-69a1.patch
-1561465-1-69a1.patch
-1561465-2-69a1.patch
-1561822-69a1.patch
-1556880-69a1.patch
-1551078-69a1.patch
-1554115-69a1.patch
-1561069-69a1.patch
-1520001-1only-69a1.patch
-1561102-1-69a1.patch
-1561102-2-69a1.patch
-1561088-69a1.patch
-1559975-01-69a1.patch
-1559975-02-69a1.patch
-1559975-03-69a1.patch
-1559975-04-69a1.patch
-1552687-69a1.patch
-1542746-1-PARTIAL-69a1.patch
-1542746-3no2-69a1.patch
 1542963-1-69a1.patch
 1542963-2-69a1.patch
 1542963-3-69a1.patch
@@ -5621,40 +5574,87 @@ NOBUG-removenonascii67a1-25314.patch
 1542963-5-69a1.patch
 1542963-6-69a1.patch
 1542963-7-69a1.patch
-1557336-69a1.patch
+1554056-69a1.patch
+1554186-69a1.patch
+1554928-69a1.patch
+1555427-69a1.patch
+1555824-69a1.patch
+1546322-69a1.patch
+1555329-69a1.patch
+1555917-69a1.patch
+1556257-69a1.patch
+1553864-69a1.patch
+1554306-69a1.patch
+1556073-69a1.patch
+1556662-69a1.patch
+1556880-69a1.patch
+1556891-1-69a1.patch
+1556891-2-69a1.patch
+1552658-69a1.patch
+1551639-1-69a1.patch
+1551639-2-69a1.patch
+1551639-3-69a1.patch
+1501277-69a1.patch
+1547193-69a1.patch
+1549386-69a1.patch
+1557229-69a1.patch
+1557278-69a1.patch
+1557213-1only-69a1.patch
 1551368-1-69a1.patch
 1551368-2-69a1.patch
 1551368-3-69a1.patch
-1559975-08-69a1.patch
-1557278-69a1.patch
+1557291-69a1.patch
+1552121-1only-69a1.patch
+1520001-1only-69a1.patch
+1557336-69a1.patch
+1558737-69a1.patch
+1557583-1-69a1.patch
+1557583-2-69a1.patch
+1524194-2-69a1.patch
+1559403-1-69a1.patch
+1559403-2-69a1.patch
+1551844-69a1.patch
+1558554-69a1.patch
+1410013-69a1.patch
+1557528-69a1.patch
+1555954-69a1.patch
+1559642-69a1.patch
+1560527-69a1.patch
 1464007-69a1.patch
+1561069-69a1.patch
+1561102-1-69a1.patch
+1558883-69a1.patch
+1561465-1-69a1.patch
+1561465-2-69a1.patch
+1561494-69a1.patch
+1561088-69a1.patch
+1559975-01-69a1.patch
+1559975-02-69a1.patch
+1559975-03-69a1.patch
+1561102-2-69a1.patch
+1507696-69a1.patch
+1561822-69a1.patch
+1559975-04-69a1.patch
+1560439-69a1.patch
+1543725-69a1.patch
 1559740-1-69a1.patch
 1559740-2-69a1.patch
-1555824-69a1.patch
-1554056-69a1.patch
-1554928-69a1.patch
+1559975-08-69a1.patch
+1473498-01-69a1.patch
+1473498-02-69a1.patch
+1473498-03-69a1.patch
+1473498-04-69a1.patch
+1473498-05-69a1.patch
+1562083-69a1.patch
+1556103-1only-69a1.patch
 1560044-1-69a1.patch
 1560044-2-69a1.patch
 1560044-3-69a1.patch
-1557213-1only-69a1.patch
-1557528-69a1.patch
-1618065-69a1.patch
-1548563-69a1.patch
-1562083-69a1.patch
-1553226-69a1.patch
-1555427-69a1.patch
-1555917-69a1.patch
-1556073-69a1.patch
 1563326-69a1.patch
 1556393-0-69a1.patch
-1561494-69a1.patch
-1556891-1-69a1.patch
-1556891-2-69a1.patch
-1558554-69a1.patch
-1555954-69a1.patch
-1543725-69a1.patch
 1561435-62-69a1.patch
-1559642-69a1.patch
+1559900-70a1.patch
+1618065-75a1.patch
 1558372-70a1.patch
 1561749-70a1.patch
 1564117-1-70a1.patch