author | Mike Hommey <mh+mozilla@glandium.org> |
Thu, 05 Sep 2013 09:01:45 +0900 | |
changeset 145606 | c2ef6df8c8d69398d99fafa85d88e6a354fb3ea0 |
parent 145605 | 34ca46861c2839621576b4f24231458504303c77 |
child 145607 | 595ef28d3cf1d60ffe70d6f76f4effbbb7021504 |
push id | 25216 |
push user | emorley@mozilla.com |
push date | Thu, 05 Sep 2013 10:06:42 +0000 |
treeherder | mozilla-central@676322e0166c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gps |
bugs | 911936 |
milestone | 26.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
|
client.mk | file | annotate | diff | comparison | revisions | |
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/client.mk +++ b/client.mk @@ -169,17 +169,17 @@ MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C endif # MOZ_BUILD_PROJECTS # 'configure' scripts generated by autoconf. CONFIGURES := $(TOPSRCDIR)/configure CONFIGURES += $(TOPSRCDIR)/js/src/configure # Make targets that are going to be passed to the real build system -OBJDIR_TARGETS = install export libs clean realclean distclean alldep maybe_clobber_profiledbuild upload sdk installer package fast-package package-compare stage-package source-package l10n-check +OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package fast-package package-compare stage-package source-package l10n-check ####################################################################### # Rules # The default rule is build build:: $(MAKE) -f $(TOPSRCDIR)/client.mk $(if $(MOZ_PGO),profiledbuild,realbuild) @@ -206,26 +206,24 @@ ifdef WANT_MOZCONFIG_MK # Include that makefile so that it is created. This should not actually change # the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives # from, has already been eval'ed. -include $(OBJDIR)/.mozconfig.mk endif # Print out any options loaded from mozconfig. -all realbuild clean depend distclean export libs install realclean:: +all realbuild clean distclean export libs install realclean:: ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED))) $(info Adding client.mk options from $(FOUND_MOZCONFIG):) $(foreach line,$(MOZCONFIG_OUT_FILTERED),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line)))) endif # Windows equivalents build_all: build -build_all_dep: alldep -build_all_depend: alldep clobber clobber_all: clean # helper target for mobile build_and_deploy: build fast-package install # Do everything from scratch everything: clean build @@ -258,17 +256,17 @@ MOZ_BUILD_DATE = $(shell $(PYTHON) $(TOP export MOZ_BUILD_DATE endif endif endif ##################################################### # Preflight, before building any project -realbuild alldep preflight_all:: +realbuild preflight_all:: ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_PREFLIGHT_ALL),,1)) # Don't run preflight_all for individual projects in multi-project builds # (when MOZ_CURRENT_PROJECT is set.) ifndef MOZ_BUILD_PROJECTS # Building a single project, OBJDIR is usable. set -e; \ for mkfile in $(MOZ_PREFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ @@ -282,17 +280,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 depend realbuild preflight postflight $(OBJDIR_TARGETS):: +configure realbuild preflight postflight $(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 @@ -378,25 +376,19 @@ endif ifneq (,$(CONFIG_STATUS)) $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in $(PYTHON) $(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk endif #################################### -# Depend - -depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status - $(MOZ_MAKE) export && $(MOZ_MAKE) depend - -#################################### # Preflight -realbuild alldep 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 #################################### @@ -410,30 +402,30 @@ realbuild:: $(OBJDIR)/Makefile $(OBJDIR # Pass these target onto the real build system $(OBJDIR_TARGETS):: $(OBJDIR)/Makefile $(OBJDIR)/config.status $(MOZ_MAKE) $@ #################################### # Postflight -realbuild alldep 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 -realbuild alldep postflight_all:: +realbuild postflight_all:: ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_POSTFLIGHT_ALL),,1)) # Don't run postflight_all for individual projects in multi-project builds # (when MOZ_CURRENT_PROJECT is set.) ifndef MOZ_BUILD_PROJECTS # Building a single project, OBJDIR is usable. set -e; \ for mkfile in $(MOZ_POSTFLIGHT_ALL); do \ $(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \ @@ -484,17 +476,16 @@ echo-variable-%: # This makefile doesn't support parallel execution. It does pass # MOZ_MAKE_FLAGS to sub-make processes, so they will correctly execute # in parallel. .NOTPARALLEL: .PHONY: checkout \ real_checkout \ - depend \ realbuild \ build \ profiledbuild \ cleansrcdir \ pull_all \ build_all \ check-clobber \ clobber \
--- a/config/rules.mk +++ b/config/rules.mk @@ -681,42 +681,31 @@ SUBMAKEFILES += $(addsuffix /Makefile, $ # of something else. Makefiles which use this var *must* provide a sensible # default rule before including rules.mk ifndef SUPPRESS_DEFAULT_RULES ifndef TIERS default all:: $(MAKE) export $(MAKE) libs $(MAKE) tools - -# Do depend as well -alldep:: - $(MAKE) export - $(MAKE) depend - $(MAKE) libs - $(MAKE) tools - endif # TIERS endif # SUPPRESS_DEFAULT_RULES ifeq ($(findstring s,$(filter-out --%, $(MAKEFLAGS))),) ECHO := echo QUIET := else ECHO := true QUIET := -q endif # Do everything from scratch everything:: $(MAKE) clean - $(MAKE) alldep - -# Add dummy depend target for tinderboxes -depend:: + $(MAKE) all # Target to only regenerate makefiles makefiles: $(SUBMAKEFILES) ifneq (,$(DIRS)$(TOOL_DIRS)$(PARALLEL_DIRS)) $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) endif
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -681,42 +681,31 @@ SUBMAKEFILES += $(addsuffix /Makefile, $ # of something else. Makefiles which use this var *must* provide a sensible # default rule before including rules.mk ifndef SUPPRESS_DEFAULT_RULES ifndef TIERS default all:: $(MAKE) export $(MAKE) libs $(MAKE) tools - -# Do depend as well -alldep:: - $(MAKE) export - $(MAKE) depend - $(MAKE) libs - $(MAKE) tools - endif # TIERS endif # SUPPRESS_DEFAULT_RULES ifeq ($(findstring s,$(filter-out --%, $(MAKEFLAGS))),) ECHO := echo QUIET := else ECHO := true QUIET := -q endif # Do everything from scratch everything:: $(MAKE) clean - $(MAKE) alldep - -# Add dummy depend target for tinderboxes -depend:: + $(MAKE) all # Target to only regenerate makefiles makefiles: $(SUBMAKEFILES) ifneq (,$(DIRS)$(TOOL_DIRS)$(PARALLEL_DIRS)) $(LOOP_OVER_PARALLEL_DIRS) $(LOOP_OVER_DIRS) $(LOOP_OVER_TOOL_DIRS) endif