Bug 1273006 - Don't include makefiles from toolkit/mozapps/installer needlessly; r=glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Sun, 15 May 2016 11:42:44 -0400
changeset 297840 f8e784f16f69e9f5f6e37892c3057bc7d4fe0c86
parent 297839 3b645930ffc37af51e2aa8b7425d004e8246435a
child 297841 b73c8bc6b9d7b824eb10f31f368a5a50472ea6a5
push id30267
push userryanvm@gmail.com
push dateWed, 18 May 2016 16:13:07 +0000
treeherdermozilla-central@c4449eab07d3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1273006
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1273006 - Don't include makefiles from toolkit/mozapps/installer needlessly; r=glandium These includes make out-of-tree builds of SpiderMonkey depend on the installer.
Makefile.in
build/moz-automation.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -281,20 +281,22 @@ ifeq (,$(filter-out Linux SunOS,$(OS_ARC
 MAKE_SYM_STORE_ARGS := -c --vcs-info
 DUMP_SYMS_BIN ?= $(DIST)/host/bin/dump_syms
 MAKE_SYM_STORE_PATH := $(DIST)/bin
 endif
 MAKE_SYM_STORE_ARGS += --install-manifest=$(DEPTH)/_build_manifests/install/dist_include,$(DIST)/include
 
 SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
+ifdef MOZ_CRASHREPORTER
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 SYMBOL_INDEX_NAME = \
   $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)-symbols.txt
+endif
 
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
 	echo building symbol store
 	$(RM) -r $(DIST)/crashreporter-symbols
 	$(RM) '$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip'
 	$(RM) '$(DIST)/$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 	$(NSINSTALL) -D $(DIST)/crashreporter-symbols
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -6,22 +6,16 @@
 ifneq (,$(filter automation/%,$(MAKECMDGOALS)))
 ifeq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION))))
 MAKEFLAGS += --output-sync=target
 else
 .NOTPARALLEL:
 endif
 endif
 
-include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
-include $(topsrcdir)/toolkit/mozapps/installer/upload-files.mk
-
-# Clear out DIST_FILES if it was set by upload-files.mk (for Android builds)
-DIST_FILES =
-
 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
 # corresponding the make target
 tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols
 tier_MOZ_AUTOMATION_L10N_CHECK = l10n-check
 tier_MOZ_AUTOMATION_PRETTY_L10N_CHECK = pretty-l10n-check
 tier_MOZ_AUTOMATION_INSTALLER = installer
 tier_MOZ_AUTOMATION_PRETTY_INSTALLER = pretty-installer
 tier_MOZ_AUTOMATION_PACKAGE = package