Bug 1412431 - Remove support for MOZ_PREFLIGHT and MOZ_POSTFLIGHT; r=nalexander
authorGregory Szorc <gps@mozilla.com>
Fri, 27 Oct 2017 14:55:31 -0700
changeset 439808 5e5ee518a4b9d43e72c879e9d124aa432fb06e1a
parent 439807 b676880e0d97b3f00c486c41c09f0da7ad692425
child 439809 5fb427c50ca3e2adb541581c68721c845d1130ac
push id8114
push userjlorenzo@mozilla.com
push dateThu, 02 Nov 2017 16:33:21 +0000
treeherdermozilla-beta@73e0d89a540f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1412431
milestone58.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 1412431 - Remove support for MOZ_PREFLIGHT and MOZ_POSTFLIGHT; r=nalexander These variables are unused in the repo. The %_ALL variation is used for sccache, however. The last use of these variables was removed when support for MacOS universal builds was removed. Someone somewhere may be relying on this functionality. But I don't think it is worth continuing to support in client.mk. If someone really needs it, we can reintroduce support for the feature elsewhere, like in mach or via mozconfig support somehow. MozReview-Commit-ID: 4KznCmK3JTN
client.mk
--- a/client.mk
+++ b/client.mk
@@ -21,20 +21,18 @@
 # See http://developer.mozilla.org/en/docs/Build_Documentation for 
 # more information.
 #
 # Options:
 #   MOZ_BUILD_PROJECTS   - Build multiple projects in subdirectories
 #                          of MOZ_OBJDIR
 #   MOZ_OBJDIR           - Destination object directory
 #   MOZ_MAKE_FLAGS       - Flags to pass to $(MAKE)
-#   MOZ_PREFLIGHT_ALL  } - Makefiles to run before any project in
-#   MOZ_PREFLIGHT      }   MOZ_BUILD_PROJECTS, before each project, after
-#   MOZ_POSTFLIGHT     }   each project, and after all projects; these
-#   MOZ_POSTFLIGHT_ALL }   variables contain space-separated lists
+#   MOZ_PREFLIGHT_ALL    - Makefiles to run before building.
+#   MOZ_POSTFLIGHT_ALL   - Makefiles to run after building.
 #
 #######################################################################
 # Defines
 
 comma := ,
 
 ifdef MACH
 ifndef NO_BUILDSTATUS_MESSAGES
@@ -270,17 +268,17 @@ else
 	done
 endif
 endif
 
 # If we're building multiple projects, but haven't specified which project,
 # loop through them.
 
 ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_BUILD_PROJECTS),,1))
-configure realbuild preflight postflight $(OBJDIR_TARGETS)::
+configure realbuild $(OBJDIR_TARGETS)::
 	set -e; \
 	for app in $(MOZ_BUILD_PROJECTS); do \
 	  $(MAKE) -f $(TOPSRCDIR)/client.mk $@ MOZ_CURRENT_PROJECT=$$app; \
 	done
 
 else
 
 # MOZ_CURRENT_PROJECT: either doing a single-project build, or building an
@@ -386,52 +384,29 @@ else
 endif
 	@$(MAKE) -f $(TOPSRCDIR)/client.mk configure CREATE_MOZCONFIG_JSON=
 
 ifneq (,$(CONFIG_STATUS))
 $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
 	$(PYTHON) $(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk
 endif
 
-
-####################################
-# Preflight
-
-realbuild preflight::
-ifdef MOZ_PREFLIGHT
-	set -e; \
-	for mkfile in $(MOZ_PREFLIGHT); do \
-	  $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \
-	done
-endif
-
 ####################################
 # Build it
 
 realbuild::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	+$(MOZ_MAKE)
 
 ####################################
 # Other targets
 
 # Pass these target onto the real build system
 $(OBJDIR_TARGETS):: $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	+$(MOZ_MAKE) $@
 
-####################################
-# Postflight
-
-realbuild postflight::
-ifdef MOZ_POSTFLIGHT
-	set -e; \
-	for mkfile in $(MOZ_POSTFLIGHT); do \
-	  $(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \
-	done
-endif
-
 endif # MOZ_CURRENT_PROJECT
 
 ####################################
 # Postflight, after building all projects
 
 ifdef MOZ_AUTOMATION
 ifndef MOZ_CURRENT_PROJECT
 $(if $(MOZ_PGO),profiledbuild,realbuild)::
@@ -477,12 +452,10 @@ echo-variable-%:
     pull_all \
     build_all \
     clobber \
     clobber_all \
     pull_and_build_all \
     everything \
     configure \
     preflight_all \
-    preflight \
-    postflight \
     postflight_all \
     $(OBJDIR_TARGETS)