rebase

bug1240930-253/mozilla/1454912-3-62a1.patch

@@ -59,7 +59,7 @@ diff --git a/config/config.mk b/config/config.mk
  GLOBAL_DEPS += backend.mk
  include backend.mk
  endif
-@@ -429,19 +432,16 @@ endif # ! WINNT
+@@ -418,19 +421,16 @@ endif # ! WINNT
  
  # Make sure any compiled classes work with at least JVM 1.4
  JAVAC_FLAGS += -source 1.4
@@ -123,7 +123,7 @@ diff --git a/python/mozbuild/mozbuild/action/file_generate.py b/python/mozbuild/
 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
-@@ -528,16 +528,20 @@ class RecursiveMakeBackend(CommonBackend
+@@ -536,16 +536,20 @@ class RecursiveMakeBackend(CommonBackend
                  try:
                      outputs.append(o.format(**substs))
                  except KeyError as e:
@@ -144,7 +144,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
                      def srcpath(p):
                          if 'locales/en-US' in p:
                              # We need an "absolute source path" relative to
-@@ -572,28 +576,30 @@ class RecursiveMakeBackend(CommonBackend
+@@ -580,28 +584,30 @@ class RecursiveMakeBackend(CommonBackend
                  # If we're doing this during export that means we need it during
                  # compile, but if we have an artifact build we don't run compile,
                  # so we can skip it altogether or let the rule run as the result of
@@ -184,10 +184,10 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
 diff --git a/python/mozbuild/mozbuild/backend/tup.py b/python/mozbuild/mozbuild/backend/tup.py
 --- a/python/mozbuild/mozbuild/backend/tup.py
 +++ b/python/mozbuild/mozbuild/backend/tup.py
-@@ -276,16 +276,17 @@ class TupOnly(CommonBackend, PartialBack
-         if obj.script and obj.method and obj.relobjdir not in skip_directories:
-             backend_file.export_shell()
+@@ -528,16 +528,17 @@ class TupBackend(CommonBackend):
              cmd = self._py_action('file_generate')
+             if obj.localized:
+                 cmd.append('--locale=en-US')
              cmd.extend([
                  obj.script,
                  obj.method,

bug1240930-253/mozilla/1642032-1-79a1.patch

@@ -14,13 +14,13 @@ Differential Revision: https://phabricator.services.mozilla.com/D78617
 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
-@@ -1421,16 +1421,24 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1427,16 +1427,24 @@ class RecursiveMakeBackend(CommonBackend
          assert len(direct_linked) == 1
  
          # TODO: see bug 1310063 for checking dependencies are set up correctly.
  
          direct_linked = direct_linked[0]
-         backend_file.write('RUST_STATIC_LIB_FOR_SHARED_LIB := %s\n' %
+         backend_file.write('RUST_STATIC_LIB := %s\n' %
                             pretty_relpath(direct_linked, direct_linked.import_name))
  
 +    def _add_install_target(self, backend_file, install_target, tier, dest, files):
@@ -39,7 +39,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
              '_tests',
              'dist/include',
          ))
-@@ -1443,17 +1451,18 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1449,17 +1457,18 @@ class RecursiveMakeBackend(CommonBackend
  
          manifest = path.replace('/', '_')
          install_manifest = self._install_manifests[manifest]
@@ -59,7 +59,7 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
                          if f.startswith('/') or isinstance(f, AbsolutePath):
                              basepath, wild = os.path.split(f.full_path)
                              if '*' in basepath:
-@@ -1462,27 +1471,22 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1468,27 +1477,22 @@ class RecursiveMakeBackend(CommonBackend
  
                              install_manifest.add_pattern_link(basepath, wild, path)
                          else: