rebases

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

@@ -37,7 +37,7 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
  ifneq (,$(filter-out WINNT,$(OS_ARCH)))
  
  ifdef COMPILE_ENVIRONMENT
- libs::
+ libs:: 
 -	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 +	cp -p $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
  endif
@@ -47,7 +47,7 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
  endif
  
  # channel-prefs.js is handled separate from other prefs due to bug 756325
- # DO NOT change the content of channel-prefs.js without taking the appropriate
+ libs:: $(srcdir)/profile/channel-prefs.js
 diff --git a/config/makefiles/target_binaries.mk b/config/makefiles/target_binaries.mk
 --- a/config/makefiles/target_binaries.mk
 +++ b/config/makefiles/target_binaries.mk
@@ -75,7 +75,7 @@ diff --git a/config/makefiles/target_binaries.mk b/config/makefiles/target_binar
 diff --git a/config/rules.mk b/config/rules.mk
 --- a/config/rules.mk
 +++ b/config/rules.mk
-@@ -562,17 +562,17 @@ LINKER_OUT=$(subst /,\,$1)
+@@ -554,17 +554,17 @@ LINKER_OUT=$(subst /,\,$1)
  else
  LINKER_OUT=$1
  endif
@@ -84,12 +84,12 @@ diff --git a/config/rules.mk b/config/rules.mk
  # PROGRAM = Foo
  # creates OBJS, links with LIBS to create Foo
  #
--$(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS)
+-$(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS)
 +$(PROGRAM): $(PROGOBJS) $(STATIC_LIBS_DEPS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $(call mkdir_deps,$(FINAL_TARGET))
  	$(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)
  ifdef MSMANIFEST_TOOL
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$@.manifest'; then \
@@ -97,7 +97,7 @@ diff --git a/config/rules.mk b/config/rules.mk
 diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build
 --- a/js/src/shell/moz.build
 +++ b/js/src/shell/moz.build
-@@ -59,9 +59,9 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-
+@@ -54,9 +54,9 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-
  
  # Place a GDB Python auto-load file next to the shell executable, both in
  # the build directory and in the dist/bin directory.
@@ -126,7 +126,7 @@ diff --git a/modules/libmar/tests/moz.build b/modules/libmar/tests/moz.build
 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
-@@ -1119,17 +1119,17 @@ class RecursiveMakeBackend(CommonBackend
+@@ -1108,17 +1108,17 @@ class RecursiveMakeBackend(CommonBackend
              interfaces_manifests = ' '.join(interfaces_manifests),
              xpidl_rules=rules.getvalue(),
              xpidl_modules=' '.join(xpt_modules),
@@ -165,8 +165,8 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
  from .context import FinalTargetValue
  
  from collections import defaultdict, OrderedDict
- import itertools
-@@ -81,16 +82,20 @@ class ContextDerived(TreeMetadata):
+ 
+@@ -80,16 +81,20 @@ class ContextDerived(TreeMetadata):
  
          self._context = context
  
@@ -187,7 +187,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
      def relobjdir(self):
          return mozpath.relpath(self.objdir, self.topobjdir)
  
-@@ -467,16 +472,23 @@ class BaseProgram(Linkable):
+@@ -409,16 +414,23 @@ class BaseProgram(Linkable):
          Linkable.__init__(self, context)
  
          bin_suffix = context.config.substs.get(self.SUFFIX_VAR, '')
@@ -214,7 +214,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
 diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
 --- a/python/mozbuild/mozbuild/frontend/emitter.py
 +++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -779,17 +779,18 @@ class TreeMetadataEmitter(LoggingMixin):
+@@ -759,17 +759,18 @@ class TreeMetadataEmitter(LoggingMixin):
                               'GENERATED_FILES: %s') % (symbols_file,), context)
                      shared_args['symbols_file'] = symbols_file.target_basename
  
@@ -237,7 +237,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozb
 diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py
 --- a/toolkit/crashreporter/tools/symbolstore.py
 +++ b/toolkit/crashreporter/tools/symbolstore.py
-@@ -607,31 +607,50 @@ class Dumper:
+@@ -610,31 +610,50 @@ class Dumper:
  
          elapsed = time.time() - t_start
          print('Finished processing %s in %.2fs' % (file, elapsed),
@@ -294,7 +294,7 @@ diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/
 diff --git a/toolkit/crashreporter/tools/unit-symbolstore.py b/toolkit/crashreporter/tools/unit-symbolstore.py
 --- a/toolkit/crashreporter/tools/unit-symbolstore.py
 +++ b/toolkit/crashreporter/tools/unit-symbolstore.py
-@@ -479,18 +479,17 @@ class TestFunctional(HelperMixin, unitte
+@@ -464,18 +464,17 @@ class TestFunctional(HelperMixin, unitte
              else:
                  self.dump_syms = os.path.join(self.topsrcdir,
                                                'toolkit',
@@ -314,7 +314,7 @@ diff --git a/toolkit/crashreporter/tools/unit-symbolstore.py b/toolkit/crashrepo
              self.target_bin = os.path.join(buildconfig.topobjdir,
                                             'dist', 'bin', 'firefox')
  
-@@ -499,26 +498,28 @@ class TestFunctional(HelperMixin, unitte
+@@ -484,26 +483,28 @@ class TestFunctional(HelperMixin, unitte
          HelperMixin.tearDown(self)
  
      def testSymbolstore(self):