author | coleenp |
Fri, 09 Mar 2018 12:03:20 -0500 | |
changeset 49366 | f95ef5511e1f |
parent 49067 | c153e9daadce |
child 49205 | d1a19a08389a |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
49024
953b3fd36b08
8196997: VS2017 The non-Standard std::tr1 namespace and TR1-only machinery are deprecated and will be removed
lfoltan
parents:
48078
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
26 |
################################################################ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
27 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
28 |
# Setup common utility functions. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
29 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
30 |
################################################################ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
31 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
32 |
ifndef _MAKEBASE_GMK |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
33 |
_MAKEBASE_GMK := 1 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
34 |
|
29662 | 35 |
ifeq ($(wildcard $(SPEC)),) |
36 |
$(error MakeBase.gmk needs SPEC set to a proper spec.gmk) |
|
37 |
endif |
|
38 |
||
29861 | 39 |
# By defining this pseudo target, make will automatically remove targets |
40 |
# if their recipe fails so that a rebuild is automatically triggered on the |
|
41 |
# next make invocation. |
|
42 |
.DELETE_ON_ERROR: |
|
29662 | 43 |
|
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
44 |
################################################################################ |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
45 |
# Definitions for special characters |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
46 |
################################################################################ |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
47 |
|
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
48 |
# When calling macros, the spaces between arguments are |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
49 |
# often semantically important! Sometimes we need to subst |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
50 |
# spaces and commas, therefore we need the following macros. |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
51 |
X:= |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
52 |
SPACE:=$(X) $(X) |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
53 |
COMMA:=, |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
54 |
DOLLAR:=$$ |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
55 |
HASH:=\# |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
56 |
LEFT_PAREN:=( |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
57 |
RIGHT_PAREN:=) |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
58 |
SQUOTE:=' |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
59 |
#' |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
60 |
DQUOTE:=" |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
61 |
#" |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
62 |
define NEWLINE |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
63 |
|
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
64 |
|
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
65 |
endef |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
66 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
67 |
# In GNU Make 4.0 and higher, there is a file function for writing to files. |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
68 |
ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION)))) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
69 |
HAS_FILE_FUNCTION := true |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
70 |
endif |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
71 |
|
29662 | 72 |
############################## |
73 |
# Functions |
|
74 |
############################## |
|
75 |
||
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
76 |
### Debug functions |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
77 |
|
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
78 |
# Prints the name and value of a variable |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
79 |
PrintVar = \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
80 |
$(info $(strip $1) >$($(strip $1))<) |
29662 | 81 |
|
82 |
### Functions for timers |
|
83 |
||
84 |
# Store the build times in this directory. |
|
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
85 |
BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times |
29662 | 86 |
|
87 |
# Record starting time for build of a sub repository. |
|
88 |
define RecordStartTime |
|
35008 | 89 |
$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \ |
29662 | 90 |
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable |
91 |
endef |
|
92 |
||
93 |
# Record ending time and calculate the difference and store it in a |
|
94 |
# easy to read format. Handles builds that cross midnight. Expects |
|
95 |
# that a build will never take 24 hours or more. |
|
96 |
define RecordEndTime |
|
97 |
$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1) |
|
98 |
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable |
|
99 |
$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \ |
|
100 |
$(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \ |
|
101 |
M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \ |
|
102 |
> $(BUILDTIMESDIR)/build_time_diff_$(strip $1) |
|
103 |
endef |
|
104 |
||
105 |
# Hook to be called when starting to execute a top-level target |
|
106 |
define TargetEnter |
|
107 |
$(PRINTF) "## Starting $(patsubst %-only,%,$@)\n" |
|
108 |
$(call RecordStartTime,$(patsubst %-only,%,$@)) |
|
109 |
endef |
|
110 |
||
111 |
# Hook to be called when finish executing a top-level target |
|
112 |
define TargetExit |
|
113 |
$(call RecordEndTime,$(patsubst %-only,%,$@)) |
|
114 |
$(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \ |
|
115 |
"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`" |
|
116 |
endef |
|
117 |
||
25854 | 118 |
################################################################################ |
119 |
# This macro translates $ into \$ to protect the $ from expansion in the shell. |
|
120 |
# To make this macro resilient against already escaped strings, first remove |
|
121 |
# any present escapes before escaping so that no double escapes are added. |
|
122 |
EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1))) |
|
123 |
||
124 |
################################################################################ |
|
42134
bbcdb49521b1
8169860: Clean up and unify the refactored Javadoc generation
ihse
parents:
41875
diff
changeset
|
125 |
# This macro works just like EscapeDollar above, but for #. |
bbcdb49521b1
8169860: Clean up and unify the refactored Javadoc generation
ihse
parents:
41875
diff
changeset
|
126 |
EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1))) |
bbcdb49521b1
8169860: Clean up and unify the refactored Javadoc generation
ihse
parents:
41875
diff
changeset
|
127 |
|
bbcdb49521b1
8169860: Clean up and unify the refactored Javadoc generation
ihse
parents:
41875
diff
changeset
|
128 |
################################################################################ |
25854 | 129 |
# This macro translates $ into $$ to protect the string from make itself. |
130 |
DoubleDollar = $(subst $$,$$$$,$(strip $1)) |
|
131 |
||
132 |
################################################################################ |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
133 |
# ListPathsSafely can be used to print command parameters to a file. This is |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
134 |
# typically done if the command line lenght risk being too long for the |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
135 |
# OS/shell. In later make versions, the file function can be used for this |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
136 |
# purpose. For earlier versions, a more complex implementation is provided. |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
137 |
# |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
138 |
# The function ListPathsSafely can be called either directly or, more commonly |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
139 |
# from a recipe line. If called from a recipe, it will be executed in the |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
140 |
# evaluation phase of that recipe, which means that it will write to the file |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
141 |
# before any other line in the recipe has been run. |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
142 |
ifeq ($(HAS_FILE_FUNCTION), true) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
143 |
# Param 1 - Name of variable containing paths/arguments to output |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
144 |
# Param 2 - File to print to |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
145 |
# Param 3 - Set to true to append to file instead of overwriting |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
146 |
define ListPathsSafely |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
147 |
$$(call MakeDir, $$(dir $$(strip $2))) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
148 |
$$(file $$(if $$(filter true, $$(strip $3)),>>,>) \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
149 |
$$(strip $2),$$(subst $$(SPACE),$$(NEWLINE),$$(strip $$($$(strip $1))))) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
150 |
endef |
25854 | 151 |
|
37972 | 152 |
else # HAS_FILE_FUNCTION = false |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
153 |
|
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
154 |
$(eval compress_paths = \ |
47217 | 155 |
$(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-pre-compress.incl))) |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
156 |
compress_paths += \ |
47217 | 157 |
$(subst $(TOPDIR),X97, \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
158 |
$(subst $(OUTPUTDIR),X98, \ |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
159 |
$(subst X,X00, \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
160 |
$(subst $(SPACE),\n,$(strip $1))))) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
161 |
$(eval compress_paths += \ |
47217 | 162 |
$(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-post-compress.incl))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
163 |
|
47217 | 164 |
decompress_paths=$(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
165 |
-e 's|X99|\\n|g' \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
166 |
-e 's|X98|$(OUTPUTDIR)|g' -e 's|X97|$(TOPDIR)|g' \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
167 |
-e 's|X00|X|g' |
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
168 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
169 |
ListPathsSafely_IfPrintf = \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
170 |
$(if $(word $3,$($(strip $1))), \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
171 |
$(shell $(PRINTF) -- "$(strip $(call EscapeDollar, \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
172 |
$(call compress_paths, $(wordlist $3,$4,$($(strip $1))))))\n" \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
173 |
| $(decompress_paths) >> $2)) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
174 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
175 |
# Param 1 - Name of variable containing paths/arguments to output |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
176 |
# Param 2 - File to print to |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
177 |
# Param 3 - Set to true to append to file instead of overwriting |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
178 |
define ListPathsSafely |
37972 | 179 |
ifneq (,$$(word 30001,$$($$(strip $1)))) |
180 |
$$(error Cannot list safely more than 30000 paths. $1 has $$(words $$($$(strip $1))) paths!) |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
181 |
endif |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
182 |
$$(call MakeDir, $$(dir $2)) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
183 |
ifneq ($$(strip $3), true) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
184 |
$$(shell $(RM) $$(strip $2)) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
185 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
186 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
187 |
$$(call ListPathsSafely_IfPrintf,$1,$2,1,250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
188 |
$$(call ListPathsSafely_IfPrintf,$1,$2,251,500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
189 |
$$(call ListPathsSafely_IfPrintf,$1,$2,501,750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
190 |
$$(call ListPathsSafely_IfPrintf,$1,$2,751,1000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
191 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
192 |
$$(call ListPathsSafely_IfPrintf,$1,$2,1001,1250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
193 |
$$(call ListPathsSafely_IfPrintf,$1,$2,1251,1500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
194 |
$$(call ListPathsSafely_IfPrintf,$1,$2,1501,1750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
195 |
$$(call ListPathsSafely_IfPrintf,$1,$2,1751,2000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
196 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
197 |
$$(call ListPathsSafely_IfPrintf,$1,$2,2001,2250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
198 |
$$(call ListPathsSafely_IfPrintf,$1,$2,2251,2500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
199 |
$$(call ListPathsSafely_IfPrintf,$1,$2,2501,2750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
200 |
$$(call ListPathsSafely_IfPrintf,$1,$2,2751,3000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
201 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
202 |
$$(call ListPathsSafely_IfPrintf,$1,$2,3001,3250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
203 |
$$(call ListPathsSafely_IfPrintf,$1,$2,3251,3500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
204 |
$$(call ListPathsSafely_IfPrintf,$1,$2,3501,3750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
205 |
$$(call ListPathsSafely_IfPrintf,$1,$2,3751,4000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
206 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
207 |
$$(call ListPathsSafely_IfPrintf,$1,$2,4001,4250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
208 |
$$(call ListPathsSafely_IfPrintf,$1,$2,4251,4500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
209 |
$$(call ListPathsSafely_IfPrintf,$1,$2,4501,4750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
210 |
$$(call ListPathsSafely_IfPrintf,$1,$2,4751,5000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
211 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
212 |
$$(call ListPathsSafely_IfPrintf,$1,$2,5001,5250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
213 |
$$(call ListPathsSafely_IfPrintf,$1,$2,5251,5500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
214 |
$$(call ListPathsSafely_IfPrintf,$1,$2,5501,5750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
215 |
$$(call ListPathsSafely_IfPrintf,$1,$2,5751,6000) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
216 |
|
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
217 |
$$(call ListPathsSafely_IfPrintf,$1,$2,6001,6250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
218 |
$$(call ListPathsSafely_IfPrintf,$1,$2,6251,6500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
219 |
$$(call ListPathsSafely_IfPrintf,$1,$2,6501,6750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
220 |
$$(call ListPathsSafely_IfPrintf,$1,$2,6751,7000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
221 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
222 |
$$(call ListPathsSafely_IfPrintf,$1,$2,7001,7250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
223 |
$$(call ListPathsSafely_IfPrintf,$1,$2,7251,7500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
224 |
$$(call ListPathsSafely_IfPrintf,$1,$2,7501,7750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
225 |
$$(call ListPathsSafely_IfPrintf,$1,$2,7751,8000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
226 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
227 |
$$(call ListPathsSafely_IfPrintf,$1,$2,8001,8250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
228 |
$$(call ListPathsSafely_IfPrintf,$1,$2,8251,8500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
229 |
$$(call ListPathsSafely_IfPrintf,$1,$2,8501,8750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
230 |
$$(call ListPathsSafely_IfPrintf,$1,$2,8751,9000) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
231 |
|
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
232 |
$$(call ListPathsSafely_IfPrintf,$1,$2,9001,9250) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
233 |
$$(call ListPathsSafely_IfPrintf,$1,$2,9251,9500) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
234 |
$$(call ListPathsSafely_IfPrintf,$1,$2,9501,9750) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
235 |
$$(call ListPathsSafely_IfPrintf,$1,$2,9751,10000) |
37972 | 236 |
|
237 |
$$(call ListPathsSafely_IfPrintf,$1,$2,10001,10250) |
|
238 |
$$(call ListPathsSafely_IfPrintf,$1,$2,10251,10500) |
|
239 |
$$(call ListPathsSafely_IfPrintf,$1,$2,10501,10750) |
|
240 |
$$(call ListPathsSafely_IfPrintf,$1,$2,10751,11000) |
|
241 |
||
242 |
$$(call ListPathsSafely_IfPrintf,$1,$2,11001,11250) |
|
243 |
$$(call ListPathsSafely_IfPrintf,$1,$2,11251,11500) |
|
244 |
$$(call ListPathsSafely_IfPrintf,$1,$2,11501,11750) |
|
245 |
$$(call ListPathsSafely_IfPrintf,$1,$2,11751,12000) |
|
246 |
||
247 |
$$(call ListPathsSafely_IfPrintf,$1,$2,12001,12250) |
|
248 |
$$(call ListPathsSafely_IfPrintf,$1,$2,12251,12500) |
|
249 |
$$(call ListPathsSafely_IfPrintf,$1,$2,12501,12750) |
|
250 |
$$(call ListPathsSafely_IfPrintf,$1,$2,12751,13000) |
|
251 |
||
252 |
$$(call ListPathsSafely_IfPrintf,$1,$2,13001,13250) |
|
253 |
$$(call ListPathsSafely_IfPrintf,$1,$2,13251,13500) |
|
254 |
$$(call ListPathsSafely_IfPrintf,$1,$2,13501,13750) |
|
255 |
$$(call ListPathsSafely_IfPrintf,$1,$2,13751,14000) |
|
256 |
||
257 |
$$(call ListPathsSafely_IfPrintf,$1,$2,14001,14250) |
|
258 |
$$(call ListPathsSafely_IfPrintf,$1,$2,14251,14500) |
|
259 |
$$(call ListPathsSafely_IfPrintf,$1,$2,14501,14750) |
|
260 |
$$(call ListPathsSafely_IfPrintf,$1,$2,14751,15000) |
|
261 |
||
262 |
$$(call ListPathsSafely_IfPrintf,$1,$2,15001,15250) |
|
263 |
$$(call ListPathsSafely_IfPrintf,$1,$2,15251,15500) |
|
264 |
$$(call ListPathsSafely_IfPrintf,$1,$2,15501,15750) |
|
265 |
$$(call ListPathsSafely_IfPrintf,$1,$2,15751,16000) |
|
266 |
||
267 |
$$(call ListPathsSafely_IfPrintf,$1,$2,16001,16250) |
|
268 |
$$(call ListPathsSafely_IfPrintf,$1,$2,16251,16500) |
|
269 |
$$(call ListPathsSafely_IfPrintf,$1,$2,16501,16750) |
|
270 |
$$(call ListPathsSafely_IfPrintf,$1,$2,16751,17000) |
|
271 |
||
272 |
$$(call ListPathsSafely_IfPrintf,$1,$2,17001,17250) |
|
273 |
$$(call ListPathsSafely_IfPrintf,$1,$2,17251,17500) |
|
274 |
$$(call ListPathsSafely_IfPrintf,$1,$2,17501,17750) |
|
275 |
$$(call ListPathsSafely_IfPrintf,$1,$2,17751,18000) |
|
276 |
||
277 |
$$(call ListPathsSafely_IfPrintf,$1,$2,18001,18250) |
|
278 |
$$(call ListPathsSafely_IfPrintf,$1,$2,18251,18500) |
|
279 |
$$(call ListPathsSafely_IfPrintf,$1,$2,18501,18750) |
|
280 |
$$(call ListPathsSafely_IfPrintf,$1,$2,18751,19000) |
|
281 |
||
282 |
$$(call ListPathsSafely_IfPrintf,$1,$2,19001,19250) |
|
283 |
$$(call ListPathsSafely_IfPrintf,$1,$2,19251,19500) |
|
284 |
$$(call ListPathsSafely_IfPrintf,$1,$2,19501,19750) |
|
285 |
$$(call ListPathsSafely_IfPrintf,$1,$2,19751,20000) |
|
286 |
||
287 |
$$(call ListPathsSafely_IfPrintf,$1,$2,20001,20250) |
|
288 |
$$(call ListPathsSafely_IfPrintf,$1,$2,20251,20500) |
|
289 |
$$(call ListPathsSafely_IfPrintf,$1,$2,20501,20750) |
|
290 |
$$(call ListPathsSafely_IfPrintf,$1,$2,20751,21000) |
|
291 |
||
292 |
$$(call ListPathsSafely_IfPrintf,$1,$2,21001,21250) |
|
293 |
$$(call ListPathsSafely_IfPrintf,$1,$2,21251,21500) |
|
294 |
$$(call ListPathsSafely_IfPrintf,$1,$2,21501,21750) |
|
295 |
$$(call ListPathsSafely_IfPrintf,$1,$2,21751,22000) |
|
296 |
||
297 |
$$(call ListPathsSafely_IfPrintf,$1,$2,22001,22250) |
|
298 |
$$(call ListPathsSafely_IfPrintf,$1,$2,22251,22500) |
|
299 |
$$(call ListPathsSafely_IfPrintf,$1,$2,22501,22750) |
|
300 |
$$(call ListPathsSafely_IfPrintf,$1,$2,22751,23000) |
|
301 |
||
302 |
$$(call ListPathsSafely_IfPrintf,$1,$2,23001,23250) |
|
303 |
$$(call ListPathsSafely_IfPrintf,$1,$2,23251,23500) |
|
304 |
$$(call ListPathsSafely_IfPrintf,$1,$2,23501,23750) |
|
305 |
$$(call ListPathsSafely_IfPrintf,$1,$2,23751,24000) |
|
306 |
||
307 |
$$(call ListPathsSafely_IfPrintf,$1,$2,24001,24250) |
|
308 |
$$(call ListPathsSafely_IfPrintf,$1,$2,24251,24500) |
|
309 |
$$(call ListPathsSafely_IfPrintf,$1,$2,24501,24750) |
|
310 |
$$(call ListPathsSafely_IfPrintf,$1,$2,24751,25000) |
|
311 |
||
312 |
$$(call ListPathsSafely_IfPrintf,$1,$2,25001,25250) |
|
313 |
$$(call ListPathsSafely_IfPrintf,$1,$2,25251,25500) |
|
314 |
$$(call ListPathsSafely_IfPrintf,$1,$2,25501,25750) |
|
315 |
$$(call ListPathsSafely_IfPrintf,$1,$2,25751,26000) |
|
316 |
||
317 |
$$(call ListPathsSafely_IfPrintf,$1,$2,26001,26250) |
|
318 |
$$(call ListPathsSafely_IfPrintf,$1,$2,26251,26500) |
|
319 |
$$(call ListPathsSafely_IfPrintf,$1,$2,26501,26750) |
|
320 |
$$(call ListPathsSafely_IfPrintf,$1,$2,26751,27000) |
|
321 |
||
322 |
$$(call ListPathsSafely_IfPrintf,$1,$2,27001,27250) |
|
323 |
$$(call ListPathsSafely_IfPrintf,$1,$2,27251,27500) |
|
324 |
$$(call ListPathsSafely_IfPrintf,$1,$2,27501,27750) |
|
325 |
$$(call ListPathsSafely_IfPrintf,$1,$2,27751,28000) |
|
326 |
||
327 |
$$(call ListPathsSafely_IfPrintf,$1,$2,28001,28250) |
|
328 |
$$(call ListPathsSafely_IfPrintf,$1,$2,28251,28500) |
|
329 |
$$(call ListPathsSafely_IfPrintf,$1,$2,28501,28750) |
|
330 |
$$(call ListPathsSafely_IfPrintf,$1,$2,28751,29000) |
|
331 |
||
332 |
$$(call ListPathsSafely_IfPrintf,$1,$2,29001,29250) |
|
333 |
$$(call ListPathsSafely_IfPrintf,$1,$2,29251,29500) |
|
334 |
$$(call ListPathsSafely_IfPrintf,$1,$2,29501,29750) |
|
335 |
$$(call ListPathsSafely_IfPrintf,$1,$2,29751,30000) |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
336 |
endef |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
337 |
endif # HAS_FILE_FUNCTION |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
338 |
|
35008 | 339 |
################################################################################ |
42282
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
340 |
|
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
341 |
# A file containing a way to uniquely identify the source code revision that |
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
342 |
# the build was created from |
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
343 |
SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker |
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
344 |
|
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
345 |
# Locate all hg repositories included in the forest, as absolute paths |
39110
712f29ba8708
8136771: Implement the license-swap logic as a make target
erikj
parents:
37972
diff
changeset
|
346 |
FindAllReposAbs = \ |
47217 | 347 |
$(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \ |
348 |
$(addprefix $(TOPDIR)/, .hg */.hg */*/.hg */*/*/.hg */*/*/*/.hg) \ |
|
39110
712f29ba8708
8136771: Implement the license-swap logic as a make target
erikj
parents:
37972
diff
changeset
|
349 |
))))) |
712f29ba8708
8136771: Implement the license-swap logic as a make target
erikj
parents:
37972
diff
changeset
|
350 |
|
42282
faf3b6722c44
8031567: Better model for storing source revision information
ihse
parents:
42134
diff
changeset
|
351 |
# Locate all hg repositories included in the forest, as relative paths |
39110
712f29ba8708
8136771: Implement the license-swap logic as a make target
erikj
parents:
37972
diff
changeset
|
352 |
FindAllReposRel = \ |
47217 | 353 |
$(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs)))) |
12801 | 354 |
|
35008 | 355 |
################################################################################ |
356 |
||
12801 | 357 |
define SetupLogging |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
358 |
ifeq ($$(LOG_PROFILE_TIMES_FILE), true) |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
359 |
ifeq ($$(IS_GNU_TIME), yes) |
47217 | 360 |
SHELL := $$(BASH) $$(TOPDIR)/make/scripts/shell-profiler.sh \ |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
361 |
gnutime $$(TIME) \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
362 |
$$(OUTPUTDIR)/build-profile.log $$(SHELL) |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
363 |
else ifneq ($$(FLOCK), ) |
47217 | 364 |
SHELL := $$(BASH) $$(TOPDIR)/make/scripts/shell-profiler.sh \ |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
365 |
flock $$(FLOCK) \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
366 |
$$(OUTPUTDIR)/build-profile.log $$(SHELL) |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
367 |
endif |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
368 |
endif |
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
369 |
|
29662 | 370 |
ifeq ($$(LOG_LEVEL), trace) |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
371 |
SHELL_NO_RECURSE := $$(SHELL) |
20363 | 372 |
# Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make |
373 |
# For each target executed, will print |
|
374 |
# Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer) |
|
375 |
# but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much |
|
376 |
# (and causing a crash on Cygwin). |
|
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
377 |
SHELL = $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(SHELL_NO_RECURSE) -x |
20363 | 378 |
endif |
44465
26fabd8abee9
8177770: Need more precise control on build system logging
asemenyuk
parents:
44027
diff
changeset
|
379 |
|
35444 | 380 |
# The warn level can never be turned off |
381 |
LogWarn = $$(info $$(strip $$1)) |
|
29662 | 382 |
LOG_WARN := |
383 |
ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),) |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
384 |
LogInfo = $$(info $$(strip $$1)) |
29662 | 385 |
LOG_INFO := |
20363 | 386 |
else |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
387 |
LogInfo = |
29662 | 388 |
LOG_INFO := > /dev/null |
20363 | 389 |
endif |
29662 | 390 |
ifneq ($$(findstring $$(LOG_LEVEL), debug trace),) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
391 |
LogDebug = $$(info $$(strip $$1)) |
29662 | 392 |
LOG_DEBUG := |
20363 | 393 |
else |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
394 |
LogDebug = |
29662 | 395 |
LOG_DEBUG := > /dev/null |
20363 | 396 |
endif |
29662 | 397 |
ifneq ($$(findstring $$(LOG_LEVEL), trace),) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
398 |
LogTrace = $$(info $$(strip $$1)) |
29662 | 399 |
LOG_TRACE := |
20363 | 400 |
else |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
401 |
LogTrace = |
29662 | 402 |
LOG_TRACE := > /dev/null |
20363 | 403 |
endif |
12801 | 404 |
endef |
405 |
||
406 |
# Make sure logging is setup for everyone that includes MakeBase.gmk. |
|
407 |
$(eval $(call SetupLogging)) |
|
408 |
||
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
409 |
################################################################################ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
410 |
# Creates a sequence of increasing numbers (inclusive). |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
411 |
# Param 1 - starting number |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
412 |
# Param 2 - ending number |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
413 |
sequence = \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
414 |
$(wordlist $1, $2, $(strip \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
415 |
$(eval SEQUENCE_COUNT :=) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
416 |
$(call _sequence-do,$(strip $2)))) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
417 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
418 |
_sequence-do = \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
419 |
$(if $(word $1, $(SEQUENCE_COUNT)),, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
420 |
$(eval SEQUENCE_COUNT += .) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
421 |
$(words $(SEQUENCE_COUNT)) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
422 |
$(call _sequence-do,$1)) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
423 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
424 |
################################################################################ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
425 |
|
49024
953b3fd36b08
8196997: VS2017 The non-Standard std::tr1 namespace and TR1-only machinery are deprecated and will be removed
lfoltan
parents:
48078
diff
changeset
|
426 |
MAX_PARAMS := 36 |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
427 |
PARAM_SEQUENCE := $(call sequence, 2, $(MAX_PARAMS)) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
428 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
429 |
# Template for creating a macro taking named parameters. To use it, assign the |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
430 |
# template to a variable with the name you want for your macro, using '=' |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
431 |
# assignment. Then define a macro body with the suffix "Body". The Body macro |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
432 |
# should take 1 parameter which should be a unique string for that invocation |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
433 |
# of the macro. |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
434 |
# Ex: |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
435 |
# SetupFoo = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
436 |
# define SetupFooBody |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
437 |
# # do something |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
438 |
# # access parameters as $$($1_BAR) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
439 |
# endef |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
440 |
# Call it like this |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
441 |
# $(eval $(call SetupFoo, BUILD_SOMETHING, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
442 |
# BAR := some parameter value, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
443 |
# )) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
444 |
define NamedParamsMacroTemplate |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
445 |
$(if $($(MAX_PARAMS)),$(error Internal makefile error: \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
446 |
Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk)) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
447 |
# Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
448 |
$(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\ |
43044 | 449 |
$(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE))) |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
450 |
# Debug print all named parameter names and values |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
451 |
$(if $(findstring $(LOG_LEVEL),debug trace), \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
452 |
$(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
453 |
$(if $(strip $($i)),$(NEWLINE) $(strip [$i] $(if $(filter $(LOG_LEVEL), trace), \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
454 |
$($i), $(wordlist 1, 20, $($(i))) $(if $(word 21, $($(i))), ...))))))) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
455 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
456 |
$(if $(DEBUG_$(strip $1)), |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
457 |
$(info -------- <<< Begin expansion of $(strip $1)) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
458 |
$(info $(call $(0)Body,$(strip $1))) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
459 |
$(info -------- >>> End expansion of $(strip $1)) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
460 |
) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
461 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
462 |
$(call $(0)Body,$(strip $1)) |
14111 | 463 |
endef |
464 |
||
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
465 |
################################################################################ |
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
466 |
# Replace question marks with space in string. This macro needs to be called on |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
467 |
# files from CacheFind in case any of them contains space in their file name, |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
468 |
# since CacheFind replaces space with ?. |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
469 |
# Param 1 - String to replace in |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
470 |
DecodeSpace = \ |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
471 |
$(subst ?,$(SPACE),$(strip $1)) |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
472 |
EncodeSpace = \ |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
473 |
$(subst $(SPACE),?,$(strip $1)) |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
474 |
|
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
475 |
################################################################################ |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
476 |
# Make directory without forking mkdir if not needed. |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
477 |
# |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
478 |
# If a directory with an encoded space is provided, the wildcard function |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
479 |
# sometimes returns false answers (typically if the dir existed when the |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
480 |
# makefile was parsed, but was deleted by a previous rule). In that case, always |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
481 |
# call mkdir regardless of what wildcard says. |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
482 |
# |
35008 | 483 |
# 1: List of directories to create |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
484 |
MakeDir = \ |
35444 | 485 |
$(strip \ |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
486 |
$(eval MakeDir_dirs_to_make := $(strip $(foreach d, $1, \ |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
487 |
$(if $(findstring ?, $d), '$(call DecodeSpace, $d)', \ |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
488 |
$(if $(wildcard $d), , $d) \ |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
489 |
) \ |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
490 |
))) \ |
35444 | 491 |
$(if $(MakeDir_dirs_to_make), $(shell $(MKDIR) -p $(MakeDir_dirs_to_make))) \ |
492 |
) |
|
14111 | 493 |
|
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
494 |
# Make directory for target file. Should handle spaces in filenames. Just |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
495 |
# calling $(call MakeDir $(@D)) will not work if the directory contains a space |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
496 |
# and the target file already exists. In that case, the target file will have |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
497 |
# its wildcard ? resolved and the $(@D) will evaluate each space separated dir |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
498 |
# part on its own. |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
499 |
MakeTargetDir = \ |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
500 |
$(call MakeDir, $(dir $(call EncodeSpace, $@))) |
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
501 |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
502 |
################################################################################ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
503 |
# Assign a variable only if it is empty |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
504 |
# Param 1 - Variable to assign |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
505 |
# Param 2 - Value to assign |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
506 |
SetIfEmpty = \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
507 |
$(if $($(strip $1)),,$(eval $(strip $1) := $2)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
508 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
509 |
################################################################################ |
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
510 |
# All install-file and related macros automatically call DecodeSpace when needed. |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
511 |
|
14111 | 512 |
ifeq ($(OPENJDK_TARGET_OS),solaris) |
20363 | 513 |
# On Solaris, if the target is a symlink and exists, cp won't overwrite. |
514 |
# Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the |
|
515 |
# name of the target file differs from the source file, rename after copy. |
|
23168
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
516 |
# If the source and target parent directories are the same, recursive copy doesn't work |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
517 |
# so we fall back on regular copy, which isn't preserving symlinks. |
20363 | 518 |
define install-file |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
519 |
$(call MakeTargetDir) |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
520 |
$(RM) '$(call DecodeSpace, $@)' |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
521 |
if [ '$(call DecodeSpace, $(dir $@))' != \ |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
522 |
'$(call DecodeSpace, $(dir $(call EncodeSpace, $<)))' ]; then \ |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
523 |
$(CP) -f -r -P '$(call DecodeSpace, $<)' '$(call DecodeSpace, $(@D))'; \ |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
524 |
if [ '$(call DecodeSpace, $(@F))' != \ |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
525 |
'$(call DecodeSpace, $(notdir $(call EncodeSpace, $(<))))' ]; then \ |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
526 |
$(MV) '$(call DecodeSpace, $(@D)/$(<F))' '$(call DecodeSpace, $@)'; \ |
23168
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
527 |
fi; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
528 |
else \ |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
529 |
if [ -L '$(call DecodeSpace, $<)' ]; then \ |
23168
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
530 |
$(ECHO) "Source file is a symlink and target is in the same directory: $< $@" ; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
531 |
exit 1; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
532 |
fi; \ |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
533 |
$(CP) -f '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'; \ |
23168
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
534 |
fi |
20363 | 535 |
endef |
14111 | 536 |
else ifeq ($(OPENJDK_TARGET_OS),macosx) |
20363 | 537 |
# On mac, extended attributes sometimes creep into the source files, which may later |
538 |
# cause the creation of ._* files which confuses testing. Clear these with xattr if |
|
539 |
# set. Some files get their write permissions removed after being copied to the |
|
540 |
# output dir. When these are copied again to images, xattr would fail. By only clearing |
|
541 |
# attributes when they are present, failing on this is avoided. |
|
37972 | 542 |
# |
543 |
# If copying a soft link to a directory, need to delete the target first to avoid |
|
544 |
# weird errors. |
|
20363 | 545 |
define install-file |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
546 |
$(call MakeTargetDir) |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
547 |
$(RM) '$(call DecodeSpace, $@)' |
48912 | 548 |
# Work around a weirdness with cp on Macosx. When copying a symlink, if |
549 |
# the target of the link is write protected (e.g. 444), cp will add |
|
550 |
# write permission for the user on the target file (644). Avoid this by |
|
551 |
# using ln to create a new link instead. |
|
552 |
if [ -h '$(call DecodeSpace, $<)' ]; then \ |
|
553 |
$(LN) -s "`$(READLINK) '$(call DecodeSpace, $<)'`" '$(call DecodeSpace, $@)'; \ |
|
554 |
else \ |
|
555 |
$(CP) -fRP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'; \ |
|
556 |
fi |
|
557 |
if [ -n "`$(XATTR) -ls '$(call DecodeSpace, $@)'`" ]; then \ |
|
558 |
$(XATTR) -cs '$(call DecodeSpace, $@)'; \ |
|
559 |
fi |
|
20363 | 560 |
endef |
14111 | 561 |
else |
20363 | 562 |
define install-file |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
563 |
$(call MakeTargetDir) |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
564 |
$(CP) -fP '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)' |
20363 | 565 |
endef |
14111 | 566 |
endif |
567 |
||
42425 | 568 |
# Variant of install file that does not preserve symlinks |
569 |
define install-file-nolink |
|
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
570 |
$(call MakeTargetDir) |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
571 |
$(CP) -f '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)' |
42425 | 572 |
endef |
573 |
||
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
574 |
################################################################################ |
41260 | 575 |
# Take two paths and return the path of the last common directory. |
576 |
# Ex: /foo/bar/baz, /foo/bar/banan -> /foo/bar |
|
577 |
# foo/bar/baz, /foo/bar -> <empty> |
|
578 |
# |
|
579 |
# The x prefix is used to preserve the presence of the initial slash |
|
580 |
# |
|
581 |
# $1 - Path to compare |
|
582 |
# $2 - Other path to compare |
|
583 |
FindCommonPathPrefix = \ |
|
584 |
$(patsubst x%,%,$(subst $(SPACE),/,$(strip \ |
|
585 |
$(call FindCommonPathPrefixHelper, \ |
|
586 |
$(subst /,$(SPACE),x$(strip $1)), $(subst /,$(SPACE),x$(strip $2))) \ |
|
587 |
))) |
|
588 |
||
589 |
FindCommonPathPrefixHelper = \ |
|
590 |
$(if $(call equals, $(firstword $1), $(firstword $2)), \ |
|
591 |
$(firstword $1) \ |
|
592 |
$(call FindCommonPathPrefixHelper, \ |
|
593 |
$(wordlist 2, $(words $1), $1), $(wordlist 2, $(words $2), $2) \ |
|
594 |
) \ |
|
595 |
) |
|
596 |
||
597 |
# Convert a partial path into as many directory levels of ../, removing |
|
598 |
# leading and following /. |
|
599 |
# Ex: foo/bar/baz/ -> ../../.. |
|
600 |
# foo/bar -> ../.. |
|
601 |
# /foo -> .. |
|
602 |
DirToDotDot = \ |
|
603 |
$(subst $(SPACE),/,$(foreach d, $(subst /,$(SPACE),$1),..)) |
|
604 |
||
605 |
# Computes the relative path from a directory to a file |
|
606 |
# $1 - File to compute the relative path to |
|
607 |
# $2 - Directory to compute the relative path from |
|
608 |
RelativePath = \ |
|
609 |
$(eval $1_prefix := $(call FindCommonPathPrefix, $1, $2)) \ |
|
610 |
$(eval $1_dotdots := $(call DirToDotDot, $(patsubst $($(strip $1)_prefix)/%, %, $2))) \ |
|
611 |
$(eval $1_suffix := $(patsubst $($(strip $1)_prefix)/%, %, $1)) \ |
|
612 |
$($(strip $1)_dotdots)/$($(strip $1)_suffix) |
|
613 |
||
614 |
################################################################################ |
|
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
615 |
# link-file-* works similarly to install-file but creates a symlink instead. |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
616 |
# There are two versions, either creating a relative or an absolute link. Be |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
617 |
# careful when using this on Windows since the symlink created is only valid in |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
618 |
# the unix emulation environment. |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
619 |
define link-file-relative |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
620 |
$(call MakeTargetDir) |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
621 |
$(RM) '$(call DecodeSpace, $@)' |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
622 |
$(LN) -s '$(call DecodeSpace, $(call RelativePath, $<, $(@D)))' '$(call DecodeSpace, $@)' |
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
623 |
endef |
41260 | 624 |
|
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
625 |
define link-file-absolute |
47751
f7e430cbfe34
8190702: JMC packaging causing errors in JDK 10 consolidated repo (macOS)
erikj
parents:
47715
diff
changeset
|
626 |
$(call MakeTargetDir) |
47348
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
627 |
$(RM) '$(call DecodeSpace, $@)' |
504e70cd64ad
8189324: install-file macro no longer handles files with $ in them
erikj
parents:
47334
diff
changeset
|
628 |
$(LN) -s '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)' |
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41260
diff
changeset
|
629 |
endef |
41260 | 630 |
|
631 |
################################################################################ |
|
25854 | 632 |
# Filter out duplicate sub strings while preserving order. Keeps the first occurance. |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
633 |
uniq = \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
634 |
$(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))) |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
635 |
|
32553
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
636 |
# Returns all whitespace-separated words in $2 where at least one of the |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
637 |
# whitespace-separated words in $1 is a substring. |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
638 |
containing = \ |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
639 |
$(strip \ |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
640 |
$(foreach v,$(strip $2),\ |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
641 |
$(call uniq,$(foreach p,$(strip $1),$(if $(findstring $p,$v),$v))))) |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
642 |
|
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
643 |
# Returns all whitespace-separated words in $2 where none of the |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
644 |
# whitespace-separated words in $1 is a substring. |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
645 |
not-containing = \ |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
646 |
$(strip $(filter-out $(call containing,$1,$2),$2)) |
418e3b5ff477
8136383: Improve make utilities containing and not-containing
erikj
parents:
32460
diff
changeset
|
647 |
|
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
648 |
# Return a list of all string elements that are duplicated in $1. |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
649 |
dups = \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
650 |
$(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
651 |
$(words $(filter $v, $1))), $v))) |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
652 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
653 |
# String equals |
28607
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
654 |
equals = \ |
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
655 |
$(and $(findstring $(strip $1),$(strip $2)),\ |
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
656 |
$(findstring $(strip $2),$(strip $1))) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
657 |
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
658 |
# Remove a whole list of prefixes |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
659 |
# $1 - List of prefixes |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
660 |
# $2 - List of elements to process |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
661 |
remove-prefixes = \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
662 |
$(strip $(if $1,$(patsubst $(firstword $1)%,%,\ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
663 |
$(call remove-prefixes,$(filter-out $(firstword $1),$1),$2)),$2)) |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
664 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
665 |
# Convert the string given to upper case, without any $(shell) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
666 |
# Inspired by http://lists.gnu.org/archive/html/help-make/2013-09/msg00009.html |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
667 |
uppercase_table := a,A b,B c,C d,D e,E f,F g,G h,H i,I j,J k,K l,L m,M n,N o,O \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
668 |
p,P q,Q r,R s,S t,T u,U v,V w,W x,X y,Y z,Z |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
669 |
|
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
670 |
uppercase_internal = \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
671 |
$(if $(strip $1), $$(subst $(firstword $1), $(call uppercase_internal, \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
672 |
$(wordlist 2, $(words $1), $1), $2)), $2) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
673 |
|
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
674 |
# Convert a string to upper case. Works only on a-z. |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
675 |
# $1 - The string to convert |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
676 |
uppercase = \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
677 |
$(strip \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
678 |
$(eval uppercase_result := $(call uppercase_internal, $(uppercase_table), $1)) \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
679 |
$(uppercase_result) \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
680 |
) |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
681 |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
682 |
################################################################################ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
683 |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
684 |
ifneq ($(DISABLE_CACHE_FIND), true) |
23984 | 685 |
# In Cygwin, finds are very costly, both because of expensive forks and because |
686 |
# of bad file system caching. Find is used extensively in $(shell) commands to |
|
687 |
# find source files. This makes rerunning make with no or few changes rather |
|
688 |
# expensive. To speed this up, these two macros are used to cache the results |
|
689 |
# of simple find commands for reuse. |
|
690 |
# |
|
691 |
# Runs a find and stores both the directories where it was run and the results. |
|
692 |
# This macro can be called multiple times to add to the cache. Only finds files |
|
693 |
# with no filters. |
|
694 |
# |
|
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
695 |
# Files containing space will get spaces replaced with ? because GNU Make |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
696 |
# cannot handle lists of files with space in them. By using ?, make will match |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
697 |
# the wildcard to space in many situations so we don't need to replace back |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
698 |
# to space on every use. While not a complete solution it does allow some uses |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
699 |
# of CacheFind to function with spaces in file names, including for |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
700 |
# SetupCopyFiles. |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
701 |
# |
23984 | 702 |
# Needs to be called with $(eval ) |
703 |
# |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
704 |
# Even if the performance benifit is negligible on other platforms, keep the |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
705 |
# functionality active unless explicitly disabled to exercise it more. |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
706 |
# |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
707 |
# Initialize FIND_CACHE_DIRS with := to make it a non recursively-expanded variable |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
708 |
FIND_CACHE_DIRS := |
23984 | 709 |
# Param 1 - Dirs to find in |
710 |
# Param 2 - (optional) specialization. Normally "-a \( ... \)" expression. |
|
20363 | 711 |
define FillCacheFind |
23984 | 712 |
# Filter out already cached dirs. The - is needed when FIND_CACHE_DIRS is empty |
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
713 |
# since filter out will then return empty. |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
714 |
FIND_CACHE_NEW_DIRS := $$(filter-out $$(addsuffix /%,\ |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
715 |
- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS), $1) |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
716 |
ifneq ($$(FIND_CACHE_NEW_DIRS), ) |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
717 |
# Remove any trailing slash from dirs in the cache dir list |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
718 |
FIND_CACHE_DIRS += $$(patsubst %/,%, $$(FIND_CACHE_NEW_DIRS)) |
47364 | 719 |
FIND_CACHE := $$(sort $$(FIND_CACHE) \ |
720 |
$$(shell $(FIND) $$(wildcard $$(FIND_CACHE_NEW_DIRS)) \ |
|
721 |
\( -type f -o -type l \) $2 | $(TR) ' ' '?')) |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
722 |
endif |
20363 | 723 |
endef |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
724 |
|
23984 | 725 |
# Mimics find by looking in the cache if all of the directories have been cached. |
726 |
# Otherwise reverts to shell find. This is safe to call on all platforms, even if |
|
727 |
# cache is deactivated. |
|
728 |
# |
|
25854 | 729 |
# $1 can be either a directory or a file. If it's a directory, make |
730 |
# sure we have exactly one trailing slash before the wildcard. |
|
23984 | 731 |
# The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless. |
732 |
# |
|
733 |
# Param 1 - Dirs to find in |
|
734 |
# Param 2 - (optional) specialization. Normally "-a \( ... \)" expression. |
|
735 |
define CacheFind |
|
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
44027
diff
changeset
|
736 |
$(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \ |
47364 | 737 |
$(if $(wildcard $1), $(shell $(FIND) $(wildcard $1) \( -type f -o -type l \) $2 \ |
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
738 |
| $(TR) ' ' '?')), \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
44027
diff
changeset
|
739 |
$(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(FIND_CACHE))) |
23984 | 740 |
endef |
25854 | 741 |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
742 |
else |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
743 |
# If CacheFind is disabled, just run the find command. |
23984 | 744 |
# Param 1 - Dirs to find in |
745 |
# Param 2 - (optional) specialization. Normally "-a \( ... \)" expression. |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
746 |
define CacheFind |
47364 | 747 |
$(if $(wildcard $1, \ |
748 |
$(shell $(FIND) $(wildcard $1) \( -type f -o -type l \) $2 | $(TR) ' ' '?') \ |
|
749 |
) |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
750 |
endef |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
751 |
endif |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
752 |
|
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
753 |
################################################################################ |
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
754 |
|
25854 | 755 |
define AddFileToCopy |
756 |
# Helper macro for SetupCopyFiles |
|
757 |
# 1 : Source file |
|
758 |
# 2 : Dest file |
|
759 |
# 3 : Variable to add targets to |
|
760 |
# 4 : Macro to call for copy operation |
|
42983 | 761 |
# 5 : Action text to log |
25854 | 762 |
$2: $1 |
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
763 |
$$(call LogInfo, $(strip $5) $$(patsubst $(OUTPUTDIR)/%,%,$$(call DecodeSpace, $$@))) |
25854 | 764 |
$$($$(strip $4)) |
765 |
||
766 |
$3 += $2 |
|
47435
80fd2dab3805
8187974: Merge Java Mission Control 6.1 3rdpartyreame with the JDK 18.3 3rdpartyreadme
erikj
parents:
47364
diff
changeset
|
767 |
$3_SOURCES += $1 |
25854 | 768 |
endef |
769 |
||
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
770 |
# Returns the value of the first argument |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
771 |
identity = \ |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
772 |
$(strip $1) |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
773 |
|
28902
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
774 |
# Setup make rules for copying files, with an option to do more complex |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
775 |
# processing instead of copying. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
776 |
# |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
777 |
# Parameter 1 is the name of the rule. This name is used as variable prefix, |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
778 |
# and the targets generated are listed in a variable by that name. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
779 |
# |
47435
80fd2dab3805
8187974: Merge Java Mission Control 6.1 3rdpartyreame with the JDK 18.3 3rdpartyreadme
erikj
parents:
47364
diff
changeset
|
780 |
# The list of all source files is returned in $1_SOURCES. |
80fd2dab3805
8187974: Merge Java Mission Control 6.1 3rdpartyreame with the JDK 18.3 3rdpartyreadme
erikj
parents:
47364
diff
changeset
|
781 |
# |
28902
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
782 |
# Remaining parameters are named arguments. These include: |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
783 |
# SRC : Source root dir (defaults to dir of first file) |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
784 |
# DEST : Dest root dir |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
785 |
# FILES : List of files to copy with absolute paths, or path relative to SRC. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
786 |
# Must be in SRC. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
787 |
# FLATTEN : Set to flatten the directory structure in the DEST dir. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
788 |
# MACRO : Optionally override the default macro used for making the copy. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
789 |
# Default is 'install-file' |
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
790 |
# NAME_MACRO : Optionally supply a macro that rewrites the target file name |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
791 |
# based on the source file name |
42983 | 792 |
# LOG_ACTION : Optionally specify a different action text for log messages |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
793 |
SetupCopyFiles = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
794 |
define SetupCopyFilesBody |
25854 | 795 |
|
796 |
ifeq ($$($1_MACRO), ) |
|
797 |
$1_MACRO := install-file |
|
798 |
endif |
|
799 |
||
28901
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
800 |
# Default SRC to the dir of the first file. |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
801 |
ifeq ($$($1_SRC), ) |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
802 |
$1_SRC := $$(dir $$(firstword $$($1_FILES))) |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
803 |
endif |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
804 |
|
32811
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
805 |
ifeq ($$($1_NAME_MACRO), ) |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
806 |
$1_NAME_MACRO := identity |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
807 |
endif |
df82db312e58
8135060: Stop building Xcode projects in install build
erikj
parents:
32553
diff
changeset
|
808 |
|
42983 | 809 |
ifeq ($$($1_LOG_ACTION), ) |
810 |
$1_LOG_ACTION := Copying |
|
811 |
endif |
|
812 |
||
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
813 |
# Remove any trailing slash from SRC and DEST |
28901
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
814 |
$1_SRC := $$(patsubst %/,%,$$($1_SRC)) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
815 |
$1_DEST := $$(patsubst %/,%,$$($1_DEST)) |
28901
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
816 |
|
47354
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
817 |
# Need to wrap arguments in DoubleDollar because of the eval nested inside an |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
818 |
# eval macro body. |
25854 | 819 |
$$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \ |
47354
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
820 |
$$(eval $$(call AddFileToCopy, \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
821 |
$$(call DoubleDollar, $$($1_SRC)/$$f), \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
822 |
$$(call DoubleDollar, \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
823 |
$$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)) \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
824 |
), \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
825 |
$1, \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
826 |
$$($1_MACRO), \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
827 |
$$($1_LOG_ACTION) \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
828 |
)) \ |
e8bda13da40b
8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents:
47348
diff
changeset
|
829 |
) |
25854 | 830 |
|
831 |
endef |
|
832 |
||
833 |
################################################################################ |
|
44027 | 834 |
# Parse a multiple-keyword variable, like FOO="KEYWORD1=val1;KEYWORD2=val2;..." |
835 |
# These will be converted into a series of variables like FOO_KEYWORD1=val1, |
|
836 |
# FOO_KEYWORD2=val2, etc. Unknown keywords will cause an error. |
|
837 |
# |
|
838 |
# Parameter 1 is the name of the rule, and is also the name of the variable. |
|
839 |
# |
|
840 |
# Remaining parameters are named arguments. These include: |
|
841 |
# KEYWORDS A list of valid keywords |
|
842 |
# STRING_KEYWORDS A list of valid keywords, processed as string. This means |
|
843 |
# that '%20' will be replaced by ' ' to allow for multi-word strings. |
|
844 |
# |
|
845 |
ParseKeywordVariable = $(NamedParamsMacroTemplate) |
|
846 |
define ParseKeywordVariableBody |
|
847 |
ifneq ($$($1), ) |
|
848 |
# To preserve spaces, substitute them with a hopefully unique pattern |
|
849 |
# before splitting and then re-substitute spaces back. |
|
850 |
$1_MANGLED := $$(subst $$(SPACE),||||,$$($1)) |
|
851 |
$$(foreach mangled_part, $$(subst ;, , $$($1_MANGLED)), \ |
|
852 |
$$(eval mangled_part_eval := $$(call DoubleDollar, $$(mangled_part))) \ |
|
853 |
$$(eval part := $$$$(subst ||||,$$$$(SPACE),$$$$(mangled_part_eval))) \ |
|
854 |
$$(eval $1_NO_MATCH := true) \ |
|
855 |
$$(foreach keyword, $$($1_KEYWORDS), \ |
|
856 |
$$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \ |
|
857 |
$$(if $$(filter $$(keyword)=%, $$(part)), \ |
|
858 |
$$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part)))) \ |
|
859 |
$$(eval $1_NO_MATCH := ) \ |
|
860 |
) \ |
|
861 |
) \ |
|
862 |
$$(foreach keyword, $$($1_STRING_KEYWORDS), \ |
|
863 |
$$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \ |
|
864 |
$$(if $$(filter $$(keyword)=%, $$(part)), \ |
|
865 |
$$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(subst %20, , $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part))))) \ |
|
866 |
$$(eval $1_NO_MATCH := ) \ |
|
867 |
) \ |
|
868 |
) \ |
|
869 |
$$(if $$($1_NO_MATCH), \ |
|
870 |
$$(if $$(filter $$(part), $$($1_KEYWORDS) $$($1_STRING_KEYWORDS)), \ |
|
871 |
$$(info Keyword $$(part) for $1 needs to be assigned a value.) \ |
|
872 |
, \ |
|
873 |
$$(info $$(part) is not a valid keyword for $1.) \ |
|
874 |
$$(info Valid keywords: $$($1_KEYWORDS) $$($1_STRING_KEYWORDS).) \ |
|
875 |
) \ |
|
876 |
$$(error Cannot continue) \ |
|
877 |
) \ |
|
878 |
) |
|
879 |
endif |
|
880 |
endef |
|
881 |
||
882 |
################################################################################ |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
883 |
# ShellQuote |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
884 |
# |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
885 |
# Quotes a string with single quotes and replaces single quotes with '\'' so |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
886 |
# that the contents survives being given to the shell. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
887 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
888 |
ShellQuote = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
889 |
$(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
890 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
891 |
################################################################################ |
44027 | 892 |
# FixPath |
893 |
# |
|
894 |
# On Windows, converts a path from cygwin/unix style (e.g. /bin/foo) into |
|
895 |
# "mixed mode" (e.g. c:/cygwin/bin/foo). On other platforms, return the path |
|
896 |
# unchanged. |
|
897 |
# This is normally not needed since we use the FIXPATH prefix for command lines, |
|
898 |
# but might be needed in certain circumstances. |
|
899 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
900 |
FixPath = \ |
|
901 |
$(shell $(CYGPATH) -m $1) |
|
902 |
else |
|
903 |
FixPath = \ |
|
904 |
$1 |
|
905 |
endif |
|
906 |
||
907 |
################################################################################ |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
908 |
# Write to and read from file |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
909 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
910 |
# Param 1 - File to read |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
911 |
ReadFile = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
912 |
$(shell $(CAT) $1) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
913 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
914 |
# Param 1 - Text to write |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
915 |
# Param 2 - File to write to |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
916 |
ifeq ($(HAS_FILE_FUNCTION), true) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
917 |
WriteFile = \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
918 |
$(file >$2,$(strip $1)) |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
919 |
else |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
920 |
# Use printf to get consistent behavior on all platforms. |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
921 |
WriteFile = \ |
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
33394
diff
changeset
|
922 |
$(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2) |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
923 |
endif |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
924 |
|
48078 | 925 |
# Param 1 - Text to write |
926 |
# Param 2 - File to write to |
|
927 |
ifeq ($(HAS_FILE_FUNCTION), true) |
|
928 |
AppendFile = \ |
|
929 |
$(file >>$2,$(strip $1)) |
|
930 |
else |
|
931 |
# Use printf to get consistent behavior on all platforms. |
|
932 |
AppendFile = \ |
|
933 |
$(shell $(PRINTF) "%s" $(call ShellQuote, $1) >> $2) |
|
934 |
endif |
|
935 |
||
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
936 |
################################################################################ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
937 |
# DependOnVariable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
938 |
# |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
939 |
# This macro takes a variable name and puts the value in a file only if the |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
940 |
# value has changed since last. The name of the file is returned. This can be |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
941 |
# used to create rule dependencies on make variable values. The following |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
942 |
# example would get rebuilt if the value of SOME_VAR was changed: |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
943 |
# |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
944 |
# path/to/some-file: $(call DependOnVariable, SOME_VAR) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
945 |
# echo $(SOME_VAR) > $@ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
946 |
# |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
947 |
# Note that leading and trailing white space in the value is ignored. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
948 |
# |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
949 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
950 |
# Defines the sub directory structure to store variable value file in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
951 |
DependOnVariableDirName = \ |
36506 | 952 |
$(strip $(addsuffix $(if $(MODULE),/$(MODULE)), \ |
47217 | 953 |
$(subst $(TOPDIR)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
954 |
$(firstword $(MAKEFILE_LIST)), \ |
36506 | 955 |
$(CURDIR)/$(firstword $(MAKEFILE_LIST)))))) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
956 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
957 |
# Defines the name of the file to store variable value in. Generates a name |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
958 |
# unless parameter 2 is given. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
959 |
# Param 1 - Name of variable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
960 |
# Param 2 - (optional) name of file to store value in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
961 |
DependOnVariableFileName = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
962 |
$(strip $(if $(strip $2), $2, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
963 |
$(MAKESUPPORT_OUTPUTDIR)/vardeps/$(DependOnVariableDirName)/$(strip $1).vardeps)) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
964 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
965 |
# Does the actual work with parameters stripped. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
966 |
# If the file exists AND the contents is the same as the variable, do nothing |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
967 |
# else print a new file. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
968 |
# Always returns the name of the file where the value was printed. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
969 |
# Param 1 - Name of variable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
970 |
# Param 2 - (optional) name of file to store value in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
971 |
DependOnVariableHelper = \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
972 |
$(strip \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
973 |
$(eval -include $(call DependOnVariableFileName, $1, $2)) \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
974 |
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
975 |
$(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
976 |
$(if $(findstring $(LOG_LEVEL), trace), \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
977 |
$(info NewVariable $1: >$(strip $($1))<) \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
978 |
$(info OldVariable $1: >$(strip $($1_old))<)) \ |
42134
bbcdb49521b1
8169860: Clean up and unify the refactored Javadoc generation
ihse
parents:
41875
diff
changeset
|
979 |
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ |
33054
bcb9f5ea5761
8140484: Vardeps broken when variable value contains '$'
erikj
parents:
32812
diff
changeset
|
980 |
$(call DependOnVariableFileName, $1, $2))) \ |
32807
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
981 |
$(call DependOnVariableFileName, $1, $2) \ |
20386e6d858f
8136385: Various build speed improvements for windows
erikj
parents:
32553
diff
changeset
|
982 |
) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
983 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
984 |
# Main macro |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
985 |
# Param 1 - Name of variable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
986 |
# Param 2 - (optional) name of file to store value in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
987 |
DependOnVariable = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
988 |
$(call DependOnVariableHelper,$(strip $1),$(strip $2)) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
989 |
|
35444 | 990 |
# LogCmdlines is only intended to be used by ExecuteWithLog |
991 |
ifeq ($(LOG_CMDLINES), true) |
|
992 |
LogCmdlines = $(info $(strip $1)) |
|
993 |
else |
|
994 |
LogCmdlines = |
|
995 |
endif |
|
996 |
||
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
997 |
################################################################################ |
35444 | 998 |
# ExecuteWithLog will run a command and log the output appropriately. This is |
999 |
# meant to be used by commands that do "real" work, like a compilation. |
|
1000 |
# The output is stored in a specified log file, which is displayed at the end |
|
1001 |
# of the build in case of failure. The command line itself is stored in a file, |
|
1002 |
# and also logged to stdout if the LOG=cmdlines option has been given. |
|
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
1003 |
# |
39607
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1004 |
# NOTE: If the command redirects stdout, the caller needs to wrap it in a |
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1005 |
# subshell (by adding parentheses around it), otherwise the redirect to the |
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1006 |
# subshell tee process will create a race condition where the target file may |
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1007 |
# not be fully written when the make recipe is done. |
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1008 |
# |
35444 | 1009 |
# Param 1 - The path to base the name of the log file / command line file on |
1010 |
# Param 2 - The command to run |
|
1011 |
ExecuteWithLog = \ |
|
1012 |
$(call LogCmdlines, Exececuting: [$(strip $2)]) \ |
|
48912 | 1013 |
$(call MakeDir, $(dir $(strip $1))) \ |
35444 | 1014 |
$(call WriteFile, $2, $(strip $1).cmdline) \ |
39607
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1015 |
( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \ |
35444 | 1016 |
( exitcode=$(DOLLAR)? && \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
1017 |
$(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).log && \ |
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
1018 |
$(CP) $(strip $1).cmdline $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).cmdline && \ |
39607
ace2c0283dce
8158629: bash >(...) construct still causes race conditions
erikj
parents:
39110
diff
changeset
|
1019 |
exit $(DOLLAR)exitcode ) ) |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
1020 |
|
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
1021 |
################################################################################ |
31310 | 1022 |
# Find lib dir for module |
1023 |
# Param 1 - module name |
|
42528
125bc97e7569
8066474: Remove the lib/ directory from Linux and Solaris images
erikj
parents:
41875
diff
changeset
|
1024 |
FindLibDirForModule = \ |
125bc97e7569
8066474: Remove the lib/ directory from Linux and Solaris images
erikj
parents:
41875
diff
changeset
|
1025 |
$(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1) |
31310 | 1026 |
|
1027 |
################################################################################ |
|
40241
59abac94e4f2
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39607
diff
changeset
|
1028 |
# Return a string suitable for use after a -classpath or --module-path option. It |
37030 | 1029 |
# will be correct and safe to use on all platforms. Arguments are given as space |
1030 |
# separate classpath entries. Safe for multiple nested calls. |
|
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
1031 |
# param 1 : A space separated list of classpath entries |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
1032 |
# The surrounding strip is needed to keep additional whitespace out |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
1033 |
PathList = \ |
37030 | 1034 |
"$(subst $(SPACE),$(PATH_SEP),$(strip $(subst $(DQUOTE),,$1)))" |
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
1035 |
|
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
1036 |
################################################################################ |
37402 | 1037 |
# Check if a specified hotspot variant is being built, or at least one of a |
1038 |
# list of variants. Will return 'true' or 'false'. |
|
1039 |
# $1 - the variant to test for |
|
1040 |
check-jvm-variant = \ |
|
1041 |
$(strip \ |
|
1042 |
$(if $(filter-out $(VALID_JVM_VARIANTS), $1), \ |
|
1043 |
$(error Internal error: Invalid variant tested: $1)) \ |
|
1044 |
$(if $(filter $1, $(JVM_VARIANTS)), true, false)) |
|
1045 |
||
1046 |
################################################################################ |
|
37770 | 1047 |
# Converts a space separated list to a comma separated list. |
1048 |
# |
|
1049 |
# Replacing double-comma with a single comma is to workaround the issue with |
|
1050 |
# some version of make on windows that doesn't substitute spaces with one comma |
|
1051 |
# properly. |
|
1052 |
CommaList = \ |
|
1053 |
$(strip \ |
|
1054 |
$(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1))) \ |
|
1055 |
) |
|
1056 |
||
1057 |
################################################################################ |
|
45323
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1058 |
# Converts a space separated list to a colon separated list. |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1059 |
# |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1060 |
# Replacing double-colon with a single colon is to workaround the issue with |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1061 |
# some version of make on windows that doesn't substitute spaces with one colon |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1062 |
# properly. |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1063 |
ColonList = \ |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1064 |
$(strip \ |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1065 |
$(subst ::,:,$(subst $(SPACE),:,$(strip $1))) \ |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1066 |
) |
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1067 |
|
52500c1d7f1f
8175824: Adapt javadoc generation to different requirements for JDK and JavaSE
ihse
parents:
44725
diff
changeset
|
1068 |
################################################################################ |
25854 | 1069 |
|
1070 |
# Hook to include the corresponding custom file, if present. |
|
47314 | 1071 |
$(eval $(call IncludeCustomExtension, common/MakeBase.gmk)) |
25854 | 1072 |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1073 |
endif # _MAKEBASE_GMK |