author | kbarrett |
Wed, 02 May 2018 19:24:52 -0400 | |
changeset 49957 | 746229cc1ab0 |
parent 49568 | 3e9cb3562d83 |
child 50507 | e5cdf2569510 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
49568 | 2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
4 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
10 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
15 |
# accompanied this code). |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
16 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
20 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
23 |
# questions. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
24 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
25 |
|
29662 | 26 |
################################################################################ |
27 |
# This file contains helper functions for Init.gmk. |
|
28 |
# It is divided in two parts, depending on if a SPEC is present or not |
|
29 |
# (HAS_SPEC is true or not). |
|
30 |
################################################################################ |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
31 |
|
29662 | 32 |
ifndef _INITSUPPORT_GMK |
33 |
_INITSUPPORT_GMK := 1 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
34 |
|
29662 | 35 |
ifeq ($(HAS_SPEC),) |
44027 | 36 |
|
37 |
# Include the corresponding closed file, if present. |
|
47313
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47296
diff
changeset
|
38 |
ifneq ($(CUSTOM_MAKE_DIR), ) |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47296
diff
changeset
|
39 |
-include $(CUSTOM_MAKE_DIR)/InitSupport.gmk |
eb28be8f935d
8188768: Fix interaction between make and autoconf after consolidation
ihse
parents:
47296
diff
changeset
|
40 |
endif |
44027 | 41 |
|
29662 | 42 |
############################################################################## |
43 |
# Helper functions for the initial part of Init.gmk, before the spec file is |
|
44 |
# loaded. Most of these functions provide parsing and setting up make options |
|
45 |
# from the command-line. |
|
46 |
############################################################################## |
|
14111 | 47 |
|
29662 | 48 |
# Make control variables, handled by Init.gmk |
44027 | 49 |
INIT_CONTROL_VARIABLES += LOG CONF CONF_NAME SPEC JOBS TEST_JOBS CONF_CHECK \ |
47956
72a474c85aee
8177956: Add TEST_VM_OPTS as convenience for run-test arguments
ihse
parents:
47456
diff
changeset
|
50 |
COMPARE_BUILD JTREG GTEST TEST_OPTS TEST_VM_OPTS |
14111 | 51 |
|
29662 | 52 |
# All known make control variables |
53 |
MAKE_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) TEST JDK_FILTER |
|
14111 | 54 |
|
29662 | 55 |
# Define a simple reverse function. |
56 |
# Should maybe move to MakeBase.gmk, but we can't include that file now. |
|
57 |
reverse = \ |
|
58 |
$(if $(strip $(1)), $(call reverse, $(wordlist 2, $(words $(1)), $(1)))) \ |
|
59 |
$(firstword $(1)) |
|
14111 | 60 |
|
29662 | 61 |
# The variable MAKEOVERRIDES contains variable assignments from the command |
62 |
# line, but in reverse order to what the user entered. |
|
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
63 |
# The '\#' <=> '\ 'dance is needed to keep values with space in them connected. |
29662 | 64 |
COMMAND_LINE_VARIABLES := $(subst \#,\ , $(call reverse, $(subst \ ,\#,$(MAKEOVERRIDES)))) |
65 |
||
29788 | 66 |
# A list like FOO="val1" BAR="val2" containing all user-supplied make |
67 |
# variables that we should propagate. |
|
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
68 |
# The '\#' <=> '\ 'dance is needed to keep values with space in them connected. |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
69 |
USER_MAKE_VARS := $(subst \#,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
70 |
$(subst \ ,\#,$(MAKEOVERRIDES)))) |
14111 | 71 |
|
29788 | 72 |
# Setup information about available configurations, if any. |
47346 | 73 |
ifneq ($(CUSTOM_ROOT), ) |
74 |
build_dir=$(CUSTOM_ROOT)/build |
|
75 |
else |
|
47217 | 76 |
build_dir=$(topdir)/build |
77 |
endif |
|
29788 | 78 |
all_spec_files=$(wildcard $(build_dir)/*/spec.gmk) |
79 |
# Extract the configuration names from the path |
|
80 |
all_confs=$(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files))) |
|
81 |
||
29662 | 82 |
# Check for unknown command-line variables |
83 |
define CheckControlVariables |
|
84 |
command_line_variables := $$(strip $$(foreach var, \ |
|
85 |
$$(subst \ ,_,$$(MAKEOVERRIDES)), \ |
|
86 |
$$(firstword $$(subst =, , $$(var))))) |
|
29788 | 87 |
unknown_command_line_variables := $$(strip \ |
88 |
$$(filter-out $$(MAKE_CONTROL_VARIABLES), $$(command_line_variables))) |
|
29662 | 89 |
ifneq ($$(unknown_command_line_variables), ) |
90 |
$$(info Note: Command line contains non-control variables:) |
|
91 |
$$(foreach var, $$(unknown_command_line_variables), $$(info * $$(var)=$$($$(var)))) |
|
92 |
$$(info Make sure it is not mistyped, and that you intend to override this variable.) |
|
93 |
$$(info 'make help' will list known control variables.) |
|
94 |
$$(info ) |
|
95 |
endif |
|
96 |
endef |
|
14111 | 97 |
|
29662 | 98 |
# Check for deprecated ALT_ variables |
99 |
define CheckDeprecatedEnvironment |
|
100 |
defined_alt_variables := $$(filter ALT_%, $$(.VARIABLES)) |
|
101 |
ifneq ($$(defined_alt_variables), ) |
|
102 |
$$(info Warning: You have the following ALT_ variables set:) |
|
103 |
$$(foreach var, $$(defined_alt_variables), $$(info * $$(var)=$$($$(var)))) |
|
104 |
$$(info ALT_ variables are deprecated, and may result in a failed build.) |
|
105 |
$$(info Please clean your environment.) |
|
106 |
$$(info ) |
|
107 |
endif |
|
108 |
endef |
|
14111 | 109 |
|
29662 | 110 |
# Check for invalid make flags like -j |
111 |
define CheckInvalidMakeFlags |
|
112 |
# This is a trick to get this rule to execute before any other rules |
|
113 |
# MAKEFLAGS only indicate -j if read in a recipe (!) |
|
114 |
$$(topdir)/make/Init.gmk: .FORCE |
|
115 |
$$(if $$(findstring --jobserver, $$(MAKEFLAGS)), \ |
|
116 |
$$(info Error: 'make -jN' is not supported, use 'make JOBS=N') \ |
|
117 |
$$(error Cannot continue) \ |
|
118 |
) |
|
119 |
.FORCE: |
|
120 |
.PHONY: .FORCE |
|
121 |
endef |
|
14111 | 122 |
|
29662 | 123 |
# Check that the CONF_CHECK option is valid and set up handling |
124 |
define ParseConfCheckOption |
|
125 |
ifeq ($$(CONF_CHECK), ) |
|
126 |
# Default behavior is fail |
|
127 |
CONF_CHECK := fail |
|
128 |
else ifneq ($$(filter-out auto fail ignore, $$(CONF_CHECK)),) |
|
129 |
$$(info Error: CONF_CHECK must be one of: auto, fail or ignore.) |
|
130 |
$$(error Cannot continue) |
|
131 |
endif |
|
132 |
endef |
|
14111 | 133 |
|
29662 | 134 |
define ParseConfAndSpec |
135 |
ifneq ($$(origin SPEC), undefined) |
|
20363 | 136 |
# We have been given a SPEC, check that it works out properly |
29662 | 137 |
ifneq ($$(origin CONF), undefined) |
138 |
# We also have a CONF argument. We can't have both. |
|
139 |
$$(info Error: Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.) |
|
140 |
$$(error Cannot continue) |
|
20363 | 141 |
endif |
34491 | 142 |
ifneq ($$(origin CONF_NAME), undefined) |
143 |
# We also have a CONF_NAME argument. We can't have both. |
|
144 |
$$(info Error: Cannot use CONF_NAME=$$(CONF_NAME) and SPEC=$$(SPEC) at the same time. Choose one.) |
|
145 |
$$(error Cannot continue) |
|
146 |
endif |
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27000
diff
changeset
|
147 |
ifeq ($$(wildcard $$(SPEC)),) |
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27000
diff
changeset
|
148 |
$$(info Error: Cannot locate spec.gmk, given by SPEC=$$(SPEC).) |
29662 | 149 |
$$(error Cannot continue) |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27000
diff
changeset
|
150 |
endif |
29662 | 151 |
ifeq ($$(filter /%, $$(SPEC)),) |
152 |
# If given with relative path, make it absolute |
|
153 |
SPECS := $$(CURDIR)/$$(strip $$(SPEC)) |
|
154 |
else |
|
155 |
SPECS := $$(SPEC) |
|
156 |
endif |
|
157 |
||
158 |
# For now, unset this SPEC variable. |
|
159 |
override SPEC := |
|
20363 | 160 |
else |
29662 | 161 |
# Use spec.gmk files in the build output directory |
29788 | 162 |
ifeq ($$(all_spec_files),) |
47346 | 163 |
ifneq ($(CUSTOM_ROOT), ) |
164 |
$$(info Error: No configurations found for $$(CUSTOM_ROOT).) |
|
165 |
else |
|
166 |
$$(info Error: No configurations found for $$(topdir).) |
|
167 |
endif |
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27000
diff
changeset
|
168 |
$$(info Please run 'bash configure' to create a configuration.) |
29662 | 169 |
$$(info ) |
170 |
$$(error Cannot continue) |
|
20363 | 171 |
endif |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
172 |
|
34491 | 173 |
ifneq ($$(origin CONF_NAME), undefined) |
174 |
ifneq ($$(origin CONF), undefined) |
|
175 |
# We also have a CONF argument. We can't have both. |
|
176 |
$$(info Error: Cannot use CONF=$$(CONF) and CONF_NAME=$$(CONF_NAME) at the same time. Choose one.) |
|
177 |
$$(error Cannot continue) |
|
178 |
endif |
|
179 |
matching_conf := $$(strip $$(filter $$(CONF_NAME), $$(all_confs))) |
|
180 |
ifeq ($$(matching_conf),) |
|
181 |
$$(info Error: No configurations found matching CONF_NAME=$$(CONF_NAME).) |
|
182 |
$$(info Available configurations in $$(build_dir):) |
|
183 |
$$(foreach var, $$(all_confs), $$(info * $$(var))) |
|
184 |
$$(error Cannot continue) |
|
185 |
else ifneq ($$(words $$(matching_conf)), 1) |
|
186 |
$$(info Error: Matching more than one configuration CONF_NAME=$$(CONF_NAME).) |
|
187 |
$$(info Available configurations in $$(build_dir):) |
|
188 |
$$(foreach var, $$(all_confs), $$(info * $$(var))) |
|
189 |
$$(error Cannot continue) |
|
190 |
else |
|
191 |
$$(info Building configuration '$$(matching_conf)' (matching CONF_NAME=$$(CONF_NAME))) |
|
192 |
endif |
|
193 |
# Create a SPEC definition. This will contain the path to exactly one spec file. |
|
194 |
SPECS := $$(build_dir)/$$(matching_conf)/spec.gmk |
|
195 |
else ifneq ($$(origin CONF), undefined) |
|
20363 | 196 |
# User have given a CONF= argument. |
197 |
ifeq ($$(CONF),) |
|
198 |
# If given CONF=, match all configurations |
|
29662 | 199 |
matching_confs := $$(strip $$(all_confs)) |
20363 | 200 |
else |
201 |
# Otherwise select those that contain the given CONF string |
|
29788 | 202 |
matching_confs := $$(strip $$(foreach var, $$(all_confs), \ |
203 |
$$(if $$(findstring $$(CONF), $$(var)), $$(var)))) |
|
20363 | 204 |
endif |
205 |
ifeq ($$(matching_confs),) |
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27000
diff
changeset
|
206 |
$$(info Error: No configurations found matching CONF=$$(CONF).) |
29662 | 207 |
$$(info Available configurations in $$(build_dir):) |
208 |
$$(foreach var, $$(all_confs), $$(info * $$(var))) |
|
209 |
$$(error Cannot continue) |
|
20363 | 210 |
else |
35008 | 211 |
# Don't repeat this output on make restarts caused by including |
212 |
# generated files. |
|
213 |
ifeq ($$(MAKE_RESTARTS),) |
|
214 |
ifeq ($$(words $$(matching_confs)), 1) |
|
48057
56d3576aadd5
8146977: Move the output "Building configuration X (matching Y)" to lower log level
ihse
parents:
47956
diff
changeset
|
215 |
ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),) |
56d3576aadd5
8146977: Move the output "Building configuration X (matching Y)" to lower log level
ihse
parents:
47956
diff
changeset
|
216 |
$$(info Building configuration '$$(matching_confs)' (matching CONF=$$(CONF))) |
56d3576aadd5
8146977: Move the output "Building configuration X (matching Y)" to lower log level
ihse
parents:
47956
diff
changeset
|
217 |
endif |
35008 | 218 |
else |
219 |
$$(info Building these configurations (matching CONF=$$(CONF)):) |
|
220 |
$$(foreach var, $$(matching_confs), $$(info * $$(var))) |
|
221 |
endif |
|
20363 | 222 |
endif |
223 |
endif |
|
14111 | 224 |
|
20363 | 225 |
# Create a SPEC definition. This will contain the path to one or more spec.gmk files. |
29662 | 226 |
SPECS := $$(addsuffix /spec.gmk, $$(addprefix $$(build_dir)/, $$(matching_confs))) |
20363 | 227 |
else |
228 |
# No CONF or SPEC given, check the available configurations |
|
29662 | 229 |
ifneq ($$(words $$(all_spec_files)), 1) |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27000
diff
changeset
|
230 |
$$(info Error: No CONF given, but more than one configuration found.) |
29662 | 231 |
$$(info Available configurations in $$(build_dir):) |
232 |
$$(foreach var, $$(all_confs), $$(info * $$(var))) |
|
233 |
$$(info Please retry building with CONF=<config pattern> (or SPEC=<spec file>).) |
|
234 |
$$(info ) |
|
235 |
$$(error Cannot continue) |
|
20363 | 236 |
endif |
14111 | 237 |
|
20363 | 238 |
# We found exactly one configuration, use it |
29662 | 239 |
SPECS := $$(strip $$(all_spec_files)) |
20363 | 240 |
endif |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
241 |
endif |
29662 | 242 |
endef |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
29060
diff
changeset
|
243 |
|
29788 | 244 |
# Extract main targets from Main.gmk using the spec provided in $2. |
245 |
# |
|
246 |
# Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force. |
|
247 |
# Param 2: The SPEC file to use. |
|
248 |
define DefineMainTargets |
|
249 |
||
250 |
# We will start by making sure the main-targets.gmk file is removed, if |
|
251 |
# make has not been restarted. By the -include, we will trigger the |
|
252 |
# rule for generating the file (which is never there since we removed it), |
|
253 |
# thus generating it fresh, and make will restart, incrementing the restart |
|
254 |
# count. |
|
255 |
main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk |
|
256 |
||
257 |
ifeq ($$(MAKE_RESTARTS),) |
|
258 |
# Only do this if make has not been restarted, and if we do not force it. |
|
259 |
ifeq ($(strip $1), FORCE) |
|
260 |
$$(shell rm -f $$(main_targets_file)) |
|
261 |
endif |
|
262 |
endif |
|
263 |
||
264 |
$$(main_targets_file): |
|
265 |
@( cd $$(topdir) && \ |
|
35008 | 266 |
$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(topdir)/make/Main.gmk \ |
29788 | 267 |
-I $$(topdir)/make/common SPEC=$(strip $2) NO_RECIPES=true \ |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
268 |
$$(MAKE_LOG_VARS) \ |
29788 | 269 |
create-main-targets-include ) |
270 |
||
271 |
# Now include main-targets.gmk. This will define ALL_MAIN_TARGETS. |
|
272 |
-include $$(main_targets_file) |
|
273 |
endef |
|
274 |
||
29662 | 275 |
define PrintConfCheckFailed |
276 |
@echo ' ' |
|
277 |
@echo "Please rerun configure! Easiest way to do this is by running" |
|
278 |
@echo "'make reconfigure'." |
|
279 |
@echo "This behavior may also be changed using CONF_CHECK=<ignore|auto>." |
|
280 |
@echo ' ' |
|
281 |
endef |
|
13697 | 282 |
|
29662 | 283 |
else # $(HAS_SPEC)=true |
284 |
############################################################################## |
|
285 |
# Helper functions for the 'main' target. These functions assume a single, |
|
29788 | 286 |
# proper and existing SPEC is included. |
29662 | 287 |
############################################################################## |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
29060
diff
changeset
|
288 |
|
47217 | 289 |
include $(TOPDIR)/make/common/MakeBase.gmk |
27560 | 290 |
|
29662 | 291 |
# Define basic logging setup |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
292 |
BUILD_LOG := $(OUTPUTDIR)/build.log |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
293 |
BUILD_PROFILE_LOG := $(OUTPUTDIR)/build-profile.log |
29662 | 294 |
|
37410
fbab762803ef
8154326: bash >(...) construct causes race conditions
erikj
parents:
35744
diff
changeset
|
295 |
BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) && wait |
27560 | 296 |
|
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
297 |
ifneq ($(CUSTOM_ROOT), ) |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
298 |
topdir=$(CUSTOM_ROOT) |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
299 |
else |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
300 |
topdir=$(TOPDIR) |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
301 |
endif |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
302 |
|
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
303 |
# Parse COMPARE_BUILD into COMPARE_BUILD_* |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
304 |
# Syntax: COMPARE_BUILD=CONF=<configure options>:PATCH=<patch file>: |
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32715
diff
changeset
|
305 |
# MAKE=<make targets>:COMP_OPTS=<compare script options>: |
35744
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
306 |
# COMP_DIR=<compare script base dir>|<default>: |
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
307 |
# FAIL=<bool> |
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
308 |
# If neither CONF or PATCH is given, assume <default> means CONF if it |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
309 |
# begins with "--", otherwise assume it means PATCH. |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
310 |
# MAKE and COMP_OPTS can only be used with CONF and/or PATCH specified. |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
311 |
# If any value contains "+", it will be replaced by space. |
35744
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
312 |
# FAIL can be set to false to have the return value of compare be ignored. |
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
313 |
define ParseCompareBuild |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
314 |
ifneq ($$(COMPARE_BUILD), ) |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
315 |
COMPARE_BUILD_OUTPUTDIR := $(topdir)/build/compare-build/$(CONF_NAME) |
35744
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
316 |
COMPARE_BUILD_FAIL := true |
33572 | 317 |
|
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
318 |
ifneq ($$(findstring :, $$(COMPARE_BUILD)), ) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
319 |
$$(foreach part, $$(subst :, , $$(COMPARE_BUILD)), \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
320 |
$$(if $$(filter PATCH=%, $$(part)), \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
321 |
$$(eval COMPARE_BUILD_PATCH=$$(strip $$(patsubst PATCH=%, %, $$(part)))) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
322 |
) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
323 |
$$(if $$(filter CONF=%, $$(part)), \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
324 |
$$(eval COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(part))))) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
325 |
) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
326 |
$$(if $$(filter MAKE=%, $$(part)), \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
327 |
$$(eval COMPARE_BUILD_MAKE=$$(strip $$(subst +, , $$(patsubst MAKE=%, %, $$(part))))) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
328 |
) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
329 |
$$(if $$(filter COMP_OPTS=%, $$(part)), \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
330 |
$$(eval COMPARE_BUILD_COMP_OPTS=$$(strip $$(subst +, , $$(patsubst COMP_OPTS=%, %, $$(part))))) \ |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
331 |
) \ |
32720
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32715
diff
changeset
|
332 |
$$(if $$(filter COMP_DIR=%, $$(part)), \ |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32715
diff
changeset
|
333 |
$$(eval COMPARE_BUILD_COMP_DIR=$$(strip $$(subst +, , $$(patsubst COMP_DIR=%, %, $$(part))))) \ |
7e0e586a6817
8137014: Various improvements in build infrastructure
ihse
parents:
32715
diff
changeset
|
334 |
) \ |
35744
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
335 |
$$(if $$(filter FAIL=%, $$(part)), \ |
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
336 |
$$(eval COMPARE_BUILD_FAIL=$$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \ |
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
337 |
) \ |
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
338 |
) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
339 |
else |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
340 |
# Separate handling for single field case, to allow for spaces in values. |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
341 |
ifneq ($$(filter PATCH=%, $$(COMPARE_BUILD)), ) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
342 |
COMPARE_BUILD_PATCH=$$(strip $$(patsubst PATCH=%, %, $$(COMPARE_BUILD))) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
343 |
else ifneq ($$(filter CONF=%, $$(COMPARE_BUILD)), ) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
344 |
COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(COMPARE_BUILD)))) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
345 |
else ifneq ($$(filter --%, $$(COMPARE_BUILD)), ) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
346 |
# Assume CONF if value begins with -- |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
347 |
COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(COMPARE_BUILD))) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
348 |
else |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
349 |
# Otherwise assume patch file |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
350 |
COMPARE_BUILD_PATCH=$$(strip $$(COMPARE_BUILD)) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
351 |
endif |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
352 |
endif |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
353 |
ifneq ($$(COMPARE_BUILD_PATCH), ) |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
354 |
ifneq ($$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH)), ) |
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
355 |
# Assume relative path, if file exists |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
356 |
COMPARE_BUILD_PATCH := $$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH)) |
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
357 |
else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), ) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
358 |
$$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist) |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
359 |
endif |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
360 |
endif |
35744
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
361 |
ifneq ($$(COMPARE_BUILD_FAIL), true) |
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
362 |
COMPARE_BUILD_IGNORE_RESULT := || true |
4f5e0998b6e9
8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents:
35444
diff
changeset
|
363 |
endif |
32715
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
364 |
endif |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
365 |
endef |
4d558a41a1ec
8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents:
32344
diff
changeset
|
366 |
|
33572 | 367 |
# Prepare for a comparison rebuild |
368 |
define PrepareCompareBuild |
|
369 |
$(ECHO) "Preparing for comparison rebuild" |
|
370 |
# Apply patch, if any |
|
49138
67912cbf784a
8199103: Can't use COMPARE_BUILD with PATCH from custom root
ihse
parents:
48907
diff
changeset
|
371 |
$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -p1 < $(COMPARE_BUILD_PATCH)) |
33572 | 372 |
# Move the first build away temporarily |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
373 |
$(RM) -r $(topdir)/build/.compare-build-temp |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
374 |
$(MKDIR) -p $(topdir)/build/.compare-build-temp |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
375 |
$(MV) $(OUTPUTDIR) $(topdir)/build/.compare-build-temp |
33572 | 376 |
# Restore an old compare-build, or create a new compare-build directory. |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
377 |
if test -d $(COMPARE_BUILD_OUTPUTDIR); then \ |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
378 |
$(MV) $(COMPARE_BUILD_OUTPUTDIR) $(OUTPUTDIR); \ |
33572 | 379 |
else \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
380 |
$(MKDIR) -p $(OUTPUTDIR); \ |
33572 | 381 |
fi |
382 |
# Re-run configure with the same arguments (and possibly some additional), |
|
383 |
# must be done after patching. |
|
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
384 |
( cd $(OUTPUTDIR) && PATH="$(ORIGINAL_PATH)" \ |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
385 |
$(BASH) $(topdir)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF)) |
33572 | 386 |
endef |
387 |
||
388 |
# Cleanup after a compare build |
|
389 |
define CleanupCompareBuild |
|
390 |
# If running with a COMPARE_BUILD patch, reverse-apply it |
|
49138
67912cbf784a
8199103: Can't use COMPARE_BUILD with PATCH from custom root
ihse
parents:
48907
diff
changeset
|
391 |
$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH)) |
33572 | 392 |
# Move this build away and restore the original build |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
393 |
$(MKDIR) -p $(topdir)/build/compare-build |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
394 |
$(MV) $(OUTPUTDIR) $(COMPARE_BUILD_OUTPUTDIR) |
48907
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
395 |
$(MV) $(topdir)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUTDIR) |
c38163717870
8198227: Fix COMPARE_BUILD after forest consolidation
ihse
parents:
48057
diff
changeset
|
396 |
$(RM) -r $(topdir)/build/.compare-build-temp |
33572 | 397 |
endef |
398 |
||
399 |
# Do the actual comparison of two builds |
|
400 |
define CompareBuildDoComparison |
|
401 |
# Compare first and second build. Ignore any error code from compare.sh. |
|
402 |
$(ECHO) "Comparing between comparison rebuild (this/new) and baseline (other/old)" |
|
403 |
$(if $(COMPARE_BUILD_COMP_DIR), \ |
|
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
404 |
+(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh $(COMPARE_BUILD_COMP_OPTS) \ |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
405 |
-2dirs $(COMPARE_BUILD_OUTPUTDIR)/$(COMPARE_BUILD_COMP_DIR) \ |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
406 |
$(OUTPUTDIR)/$(COMPARE_BUILD_COMP_DIR) $(COMPARE_BUILD_IGNORE_RESULT)), \ |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
407 |
+(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh $(COMPARE_BUILD_COMP_OPTS) \ |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
408 |
-o $(OUTPUTDIR) $(COMPARE_BUILD_IGNORE_RESULT)) \ |
33572 | 409 |
) |
410 |
endef |
|
411 |
||
412 |
define PrintFailureReports |
|
49568 | 413 |
$(if $(filter none, $(LOG_REPORT)), , \ |
414 |
$(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \ |
|
415 |
$(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \ |
|
416 |
$(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \ |
|
417 |
$(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \ |
|
418 |
$(if $(filter all, $(LOG_REPORT)), \ |
|
419 |
$(GREP) -v -e "^Note: including file:" < $(logfile) || true $(NEWLINE) \ |
|
420 |
, \ |
|
421 |
($(GREP) -v -e "^Note: including file:" < $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \ |
|
422 |
if test `$(WC) -l < $(logfile)` -gt 12; then \ |
|
423 |
$(ECHO) " ... (rest of output omitted)" ; \ |
|
424 |
fi $(NEWLINE) \ |
|
425 |
) \ |
|
426 |
) \ |
|
427 |
$(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \ |
|
428 |
$(PRINTF) "=== End of repeated output ===\n" \ |
|
33572 | 429 |
) \ |
430 |
) |
|
431 |
endef |
|
432 |
||
433 |
define PrintBuildLogFailures |
|
49568 | 434 |
$(if $(filter none, $(LOG_REPORT)), , \ |
435 |
if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then \ |
|
436 |
$(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \ |
|
437 |
$(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \ |
|
438 |
$(PRINTF) "=== End of repeated output ===\n" ; \ |
|
439 |
$(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \ |
|
440 |
else \ |
|
441 |
$(PRINTF) "\nNo indication of failed target found.\n" ; \ |
|
442 |
$(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \ |
|
443 |
fi \ |
|
444 |
) |
|
33572 | 445 |
endef |
446 |
||
29662 | 447 |
define RotateLogFiles |
35008 | 448 |
$(RM) $(BUILD_LOG).old 2> /dev/null && \ |
29662 | 449 |
$(MV) $(BUILD_LOG) $(BUILD_LOG).old 2> /dev/null || true |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
450 |
$(if $(findstring true, $(LOG_PROFILE_TIMES_FILE)), \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
451 |
$(RM) $(BUILD_PROFILE_LOG).old 2> /dev/null && \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
452 |
$(MV) $(BUILD_PROFILE_LOG) $(BUILD_PROFILE_LOG).old 2> /dev/null || true \ |
29662 | 453 |
) |
454 |
endef |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
25854
diff
changeset
|
455 |
|
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
29788
diff
changeset
|
456 |
define PrepareFailureLogs |
35008 | 457 |
$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \ |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
29788
diff
changeset
|
458 |
$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs |
44027 | 459 |
$(RM) $(MAKESUPPORT_OUTPUTDIR)/exit-with-error 2> /dev/null |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
29788
diff
changeset
|
460 |
endef |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
29788
diff
changeset
|
461 |
|
29662 | 462 |
# Remove any javac server logs and port files. This |
463 |
# prevents a new make run to reuse the previous servers. |
|
464 |
define PrepareSmartJavac |
|
465 |
$(if $(SJAVAC_SERVER_DIR), \ |
|
466 |
$(RM) -r $(SJAVAC_SERVER_DIR) 2> /dev/null && \ |
|
467 |
$(MKDIR) -p $(SJAVAC_SERVER_DIR) \ |
|
468 |
) |
|
469 |
endef |
|
27560 | 470 |
|
29662 | 471 |
define CleanupSmartJavac |
472 |
[ -f $(SJAVAC_SERVER_DIR)/server.port ] && $(ECHO) Stopping sjavac server && \ |
|
473 |
$(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true |
|
474 |
endef |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
25854
diff
changeset
|
475 |
|
35370
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
476 |
ifeq ($(OPENJDK_BUILD_OS), windows) |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
477 |
# On windows we need to synchronize with the javac server to be able to |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
478 |
# move or remove the build output directory. Since we have no proper |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
479 |
# synchronization process, wait for a while and hope it helps. This is only |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
480 |
# used by build comparisons. |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
481 |
define WaitForSmartJavacFinish |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
482 |
$(if $(SJAVAC_SERVER_DIR), \ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
483 |
sleep 5\ |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
484 |
) |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
485 |
endef |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
486 |
else |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
487 |
define WaitForSmartJavacFinish |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
488 |
endef |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
489 |
endif |
f9b430645a18
8148120: Incremental update from build-infra project
ihse
parents:
35008
diff
changeset
|
490 |
|
29662 | 491 |
define StartGlobalTimer |
35008 | 492 |
$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \ |
493 |
$(MKDIR) -p $(BUILDTIMESDIR) && \ |
|
29662 | 494 |
$(call RecordStartTime,TOTAL) |
495 |
endef |
|
27560 | 496 |
|
29662 | 497 |
define StopGlobalTimer |
498 |
$(call RecordEndTime,TOTAL) |
|
499 |
endef |
|
27560 | 500 |
|
29662 | 501 |
# Find all build_time_* files and print their contents in a list sorted |
502 |
# on the name of the sub repository. |
|
503 |
define ReportBuildTimes |
|
35008 | 504 |
$(PRINTF) $(LOG_INFO) -- \ |
29662 | 505 |
"----- Build times -------\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ |
506 |
"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ |
|
507 |
"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \ |
|
508 |
"`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | \ |
|
509 |
$(XARGS) $(CAT) | $(SORT) -k 2`" \ |
|
35008 | 510 |
"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`" \ |
511 |
$(BUILD_LOG_PIPE) |
|
29662 | 512 |
endef |
27560 | 513 |
|
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
514 |
define ReportProfileTimes |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
515 |
$(if $(findstring true, $(LOG_PROFILE_TIMES_LOG)), \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
516 |
[ ! -f $(BUILD_PROFILE_LOG) ] || \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
517 |
{ $(ECHO) Begin $(notdir $(BUILD_PROFILE_LOG)) && \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
518 |
$(CAT) $(BUILD_PROFILE_LOG) && \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
519 |
$(ECHO) End $(notdir $(BUILD_PROFILE_LOG)); \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
520 |
} \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
521 |
$(BUILD_LOG_PIPE) |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
522 |
) |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
523 |
endef |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
524 |
|
29662 | 525 |
endif # HAS_SPEC |
27560 | 526 |
|
49568 | 527 |
# Look for a given option in the LOG variable, and if found, set a variable |
528 |
# and remove the option from the LOG variable |
|
529 |
# $1: The option to look for |
|
530 |
# $2: The variable to set to "true" if the option is found |
|
531 |
define ParseLogOption |
|
532 |
ifneq ($$(findstring $1, $$(LOG)),) |
|
533 |
override $2 := true |
|
534 |
# COMMA is defined in spec.gmk, but that is not included yet |
|
535 |
COMMA := , |
|
536 |
# First try to remove ",<option>" if it exists, otherwise just remove "<option>" |
|
537 |
LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$$(strip $1),, $$(LOG))) |
|
538 |
# We might have ended up with a leading comma. Remove it. Need override |
|
539 |
# since LOG is set from the command line. |
|
540 |
override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED))) |
|
541 |
endif |
|
542 |
endef |
|
543 |
||
544 |
# Look for a given option with an assignment in the LOG variable, and if found, |
|
545 |
# set a variable to that value and remove the option from the LOG variable |
|
546 |
# $1: The option to look for |
|
547 |
# $2: The variable to set to the value of the option, if found |
|
548 |
define ParseLogValue |
|
549 |
ifneq ($$(findstring $1=, $$(LOG)),) |
|
550 |
# Make words of out comma-separated list and find the one with opt=val |
|
551 |
value := $$(strip $$(subst $$(strip $1)=,, $$(filter $$(strip $1)=%, $$(subst $$(COMMA), , $$(LOG))))) |
|
552 |
override $2 := $$(value) |
|
553 |
# COMMA is defined in spec.gmk, but that is not included yet |
|
554 |
COMMA := , |
|
555 |
# First try to remove ",<option>" if it exists, otherwise just remove "<option>" |
|
556 |
LOG_STRIPPED := $$(subst $$(strip $1)=$$(value),, \ |
|
557 |
$$(subst $$(COMMA)$$(strip $1)=$$(value),, $$(LOG))) |
|
558 |
# We might have ended up with a leading comma. Remove it. Need override |
|
559 |
# since LOG is set from the command line. |
|
560 |
override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED))) |
|
561 |
endif |
|
562 |
endef |
|
563 |
||
564 |
||
565 |
define ParseLogLevel |
|
566 |
# Catch old-style VERBOSE= command lines. |
|
567 |
ifneq ($$(origin VERBOSE), undefined) |
|
568 |
$$(info Error: VERBOSE is deprecated. Use LOG=<warn|info|debug|trace> instead.) |
|
569 |
$$(error Cannot continue) |
|
570 |
endif |
|
571 |
||
572 |
# Setup logging according to LOG |
|
573 |
||
574 |
# If "nofile" is present, do not log to a file |
|
575 |
$$(eval $$(call ParseLogOption, nofile, LOG_NOFILE)) |
|
576 |
||
577 |
# If "cmdline" is present, print all executes "important" command lines. |
|
578 |
$$(eval $$(call ParseLogOption, cmdlines, LOG_CMDLINES)) |
|
579 |
||
580 |
# If "report" is present, use non-standard reporting options at build failure. |
|
581 |
$$(eval $$(call ParseLogValue, report, LOG_REPORT)) |
|
582 |
ifneq ($$(LOG_REPORT), ) |
|
583 |
ifeq ($$(filter $$(LOG_REPORT), none all default), ) |
|
584 |
$$(info Error: LOG=report has invalid value: $$(LOG_REPORT).) |
|
585 |
$$(info Valid values: LOG=report=<none>|<all>|<default>) |
|
586 |
$$(error Cannot continue) |
|
587 |
endif |
|
588 |
endif |
|
589 |
||
590 |
# If "profile-to-log" is present, write shell times in build log |
|
591 |
$$(eval $$(call ParseLogOption, profile-to-log, LOG_PROFILE_TIMES_LOG)) |
|
592 |
||
593 |
# If "profile" is present, write shell times in separate log file |
|
594 |
# IMPORTANT: $(ParseLogOption profile-to-log) should go first. Otherwise |
|
595 |
# parsing of 'LOG=debug,profile-to-log,nofile' ends up in the following error: |
|
596 |
# Error: LOG contains unknown option or log level: debug-to-log. |
|
597 |
$$(eval $$(call ParseLogOption, profile, LOG_PROFILE_TIMES_FILE)) |
|
598 |
||
599 |
# Treat LOG=profile-to-log as if it were LOG=profile,profile-to-log |
|
600 |
LOG_PROFILE_TIMES_FILE := $$(firstword $$(LOG_PROFILE_TIMES_FILE) $$(LOG_PROFILE_TIMES_LOG)) |
|
601 |
||
602 |
override LOG_LEVEL := $$(LOG) |
|
603 |
||
604 |
ifeq ($$(LOG_LEVEL),) |
|
605 |
# Set LOG to "warn" as default if not set |
|
606 |
override LOG_LEVEL := warn |
|
607 |
endif |
|
608 |
||
609 |
ifeq ($$(LOG_LEVEL), warn) |
|
610 |
override MAKE_LOG_FLAGS := -s |
|
611 |
else ifeq ($$(LOG_LEVEL), info) |
|
612 |
override MAKE_LOG_FLAGS := -s |
|
613 |
else ifeq ($$(LOG_LEVEL), debug) |
|
614 |
override MAKE_LOG_FLAGS := |
|
615 |
else ifeq ($$(LOG_LEVEL), trace) |
|
616 |
override MAKE_LOG_FLAGS := |
|
617 |
else |
|
618 |
$$(info Error: LOG contains unknown option or log level: $$(LOG).) |
|
619 |
$$(info LOG can be <level>[,<opt>[...]] where <opt> is nofile | cmdlines | profile | profile-to-log) |
|
620 |
$$(info and <level> is warn | info | debug | trace) |
|
621 |
$$(error Cannot continue) |
|
622 |
endif |
|
623 |
endef |
|
624 |
||
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
625 |
MAKE_LOG_VARS = $(foreach v, \ |
49568 | 626 |
LOG_LEVEL LOG_NOFILE LOG_CMDLINES LOG_REPORT LOG_PROFILE_TIMES_LOG \ |
627 |
LOG_PROFILE_TIMES_FILE, \ |
|
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
628 |
$v=$($v) \ |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
629 |
) |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
630 |
|
29662 | 631 |
endif # _INITSUPPORT_GMK |