Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(400)

Delta Between Two Patch Sets: make/stepmake.make

Issue 557080043: Issue 5568: make build output terse by default (Closed)
Left Patch Set: Created 4 years, 5 months ago
Right Patch Set: s&r ly_info -> ly_progress Created 4 years, 5 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « make/mutopia-rules.make ('k') | mf/GNUmakefile » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # make/Stepmake.make 1 # make/Stepmake.make
2 2
3 # If usescons=something then reroute to scons if user is using that. 3 # If usescons=something then reroute to scons if user is using that.
4 ifdef usescons 4 ifdef usescons
5 5
6 SCONS_USER = $(wildcard $(depth)/.sconsign) 6 SCONS_USER = $(wildcard $(depth)/.sconsign)
7 ifeq ($(SCONS_USER),) 7 ifeq ($(SCONS_USER),)
8 SCONS_USER = $(wildcard $(depth)/.sconf_temp) 8 SCONS_USER = $(wildcard $(depth)/.sconf_temp)
9 endif 9 endif
10 ifneq ($(SCONS_USER),) 10 ifneq ($(SCONS_USER),)
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 echo '$(1)' 150 echo '$(1)'
151 endef 151 endef
152 else # verbose 152 else # verbose
153 # print the terse message as a comment; make will print the commands 153 # print the terse message as a comment; make will print the commands
154 define ly_info = 154 define ly_info =
155 # $(1) 155 # $(1)
156 endef 156 endef
157 endif 157 endif
158 endif 158 endif
159 159
160 # print a message about build progress
161 #
162 # $(1) = process, operation, or command
163 # $(2) = target file, i.e. $@ in a recipe
164 # $(3) = comment
165 define ly_progress =
166 $(call ly_info,$(1) $(subst $(configure-builddir)/,,$(abspath $(2))) $(3))
167 endef
168
160 all: 169 all:
161 170
162 -include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAK E_TEMPLATES))) 171 -include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAK E_TEMPLATES)))
163 172
164 -include $(addprefix $(stepdir)/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLA TES))) 173 -include $(addprefix $(stepdir)/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLA TES)))
165 174
166 175
167 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) 176 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
168 177
169 # ugh. need to do this because of PATH :=$(top-src-dir)/..:$(PATH) 178 # ugh. need to do this because of PATH :=$(top-src-dir)/..:$(PATH)
170 include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPL ATES))) 179 include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPL ATES)))
171 180
172 181
173 include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMP LATES))) 182 include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMP LATES)))
174 include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) 183 include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES)))
175 include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TE MPLATES))) 184 include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TE MPLATES)))
176 include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES) )) 185 include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES) ))
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b