rebasing

bug1240930-253/mozilla/1255485-4-61a1.patch

@@ -16,16 +16,16 @@ MozReview-Commit-ID: 7DTfCo3OdDQ
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -566,17 +566,18 @@ endif
+@@ -558,17 +558,18 @@ endif
  #
  # PROGRAM = Foo
  # creates OBJS, links with LIBS to create Foo
  #
- $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
+ $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
--	$(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
+-	$(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 +	$(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
 +
  ifdef MSMANIFEST_TOOL

bug1240930-253/mozilla/1255485-5-61a1.patch

@@ -10,13 +10,13 @@ MozReview-Commit-ID: 94uOsInnWmT
 diff --git a/python/mozbuild/mozbuild/test/backend/common.py b/python/mozbuild/mozbuild/test/backend/common.py
 --- a/python/mozbuild/mozbuild/test/backend/common.py
 +++ b/python/mozbuild/mozbuild/test/backend/common.py
-@@ -192,16 +192,24 @@ CONFIGS = defaultdict(lambda: {
-         'defines': {},
-         'non_global_defines': [],
-         'substs': {
-             'COMPILE_ENVIRONMENT': '1',
-             'LIB_SUFFIX': '.a',
-             'BIN_SUFFIX': '',
+@@ -183,16 +183,24 @@ CONFIGS = defaultdict(lambda: {
+             'RUST_TARGET': 'x86_64-unknown-linux-gnu',
+             'LIB_PREFIX': 'lib',
+             'RUST_LIB_PREFIX': 'lib',
+             'LIB_SUFFIX': 'a',
+             'RUST_LIB_SUFFIX': 'a',
+             'OS_TARGET': 'Darwin',
          },
      },
 +    'program-paths': {
@@ -192,14 +192,14 @@ new file mode 100644
 diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
 +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -658,16 +658,29 @@ class TestEmitterBasic(unittest.TestCase
-                          [mozpath.join(reader.config.topobjdir,
-                                        'test_program1.%s' %
-                                        reader.config.substs['OBJ_SUFFIX'])])
-         self.assertEqual(objs[5].objs,
-                          [mozpath.join(reader.config.topobjdir,
-                                        'test_program2.%s' %
-                                        reader.config.substs['OBJ_SUFFIX'])])
+@@ -648,16 +648,29 @@ class TestEmitterBasic(unittest.TestCase
+         self.assertIsInstance(objs[2], Program)
+         self.assertIsInstance(objs[3], SimpleProgram)
+         self.assertIsInstance(objs[4], SimpleProgram)
+ 
+         self.assertEqual(objs[2].program, 'test_program.prog')
+         self.assertEqual(objs[3].program, 'test_program1.prog')
+         self.assertEqual(objs[4].program, 'test_program2.prog')
  
 +    def test_program_paths(self):
 +        """Various moz.build settings that change the destination of PROGRAM should be

bug1240930-253/mozilla/1255485-6-61a1.patch

@@ -10,8 +10,8 @@ MozReview-Commit-ID: L5BVxWGtpeN
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -570,26 +570,26 @@ endif
- $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
+@@ -562,26 +562,26 @@ endif
+ $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
  	$(REPORT_BUILD)
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))

bug1240930-253/mozilla/1429875-1-61a1.patch

@@ -10,7 +10,7 @@ MozReview-Commit-ID: J4gt1fGUzOa
 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
-@@ -482,16 +482,19 @@ class BaseProgram(Linkable):
+@@ -424,16 +424,19 @@ class BaseProgram(Linkable):
          if self.installed:
              return ObjDirPath(self._context, '!/' + mozpath.join(self.install_target, self.program))
          else:
@@ -30,7 +30,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
  
  
  class HostProgram(HostMixin, BaseProgram):
-@@ -596,16 +599,20 @@ class BaseLibrary(Linkable):
+@@ -519,16 +522,20 @@ class BaseLibrary(Linkable):
              )
              self.import_name = self.lib_name
  
@@ -54,28 +54,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
 diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
 +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -649,16 +649,20 @@ class TestEmitterBasic(unittest.TestCase
-         self.assertIsInstance(objs[3], Program)
-         self.assertIsInstance(objs[4], SimpleProgram)
-         self.assertIsInstance(objs[5], SimpleProgram)
- 
-         self.assertEqual(objs[3].program, 'test_program.prog')
-         self.assertEqual(objs[4].program, 'test_program1.prog')
-         self.assertEqual(objs[5].program, 'test_program2.prog')
- 
-+        self.assertEqual(objs[3].name, 'test_program.prog')
-+        self.assertEqual(objs[4].name, 'test_program1.prog')
-+        self.assertEqual(objs[5].name, 'test_program2.prog')
-+
-         self.assertEqual(objs[4].objs,
-                          [mozpath.join(reader.config.topobjdir,
-                                        'test_program1.%s' %
-                                        reader.config.substs['OBJ_SUFFIX'])])
-         self.assertEqual(objs[5].objs,
-                          [mozpath.join(reader.config.topobjdir,
-                                        'test_program2.%s' %
-                                        reader.config.substs['OBJ_SUFFIX'])])
-@@ -1176,19 +1180,25 @@ class TestEmitterBasic(unittest.TestCase
+@@ -1116,19 +1116,25 @@ class TestEmitterBasic(unittest.TestCase
  
      def test_linkables_cxx_link(self):
          """Test that linkables transitively set cxx_link properly."""