author | mockner |
Thu, 24 Sep 2015 11:26:30 -0400 | |
changeset 33099 | 55ad1d5370f6 |
parent 32460 | 9e9bffb3029a |
child 32553 | 418e3b5ff477 |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, 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 |
|
29662 | 67 |
############################## |
68 |
# Functions |
|
69 |
############################## |
|
70 |
||
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
71 |
### Debug functions |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
72 |
|
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
73 |
# 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
|
74 |
PrintVar = \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
75 |
$(info $(strip $1) >$($(strip $1))<) |
29662 | 76 |
|
77 |
### Functions for timers |
|
78 |
||
79 |
# Store the build times in this directory. |
|
80 |
BUILDTIMESDIR=$(OUTPUT_ROOT)/make-support/build-times |
|
81 |
||
82 |
# Record starting time for build of a sub repository. |
|
83 |
define RecordStartTime |
|
84 |
$(MKDIR) -p $(BUILDTIMESDIR) |
|
85 |
$(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) |
|
86 |
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable |
|
87 |
endef |
|
88 |
||
89 |
# Record ending time and calculate the difference and store it in a |
|
90 |
# easy to read format. Handles builds that cross midnight. Expects |
|
91 |
# that a build will never take 24 hours or more. |
|
92 |
define RecordEndTime |
|
93 |
$(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) |
|
94 |
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable |
|
95 |
$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \ |
|
96 |
$(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \ |
|
97 |
M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \ |
|
98 |
> $(BUILDTIMESDIR)/build_time_diff_$(strip $1) |
|
99 |
endef |
|
100 |
||
101 |
# Hook to be called when starting to execute a top-level target |
|
102 |
define TargetEnter |
|
103 |
$(PRINTF) "## Starting $(patsubst %-only,%,$@)\n" |
|
104 |
$(call RecordStartTime,$(patsubst %-only,%,$@)) |
|
105 |
endef |
|
106 |
||
107 |
# Hook to be called when finish executing a top-level target |
|
108 |
define TargetExit |
|
109 |
$(call RecordEndTime,$(patsubst %-only,%,$@)) |
|
110 |
$(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \ |
|
111 |
"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`" |
|
112 |
endef |
|
113 |
||
25854 | 114 |
################################################################################ |
115 |
# This macro translates $ into \$ to protect the $ from expansion in the shell. |
|
116 |
# To make this macro resilient against already escaped strings, first remove |
|
117 |
# any present escapes before escaping so that no double escapes are added. |
|
118 |
EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1))) |
|
119 |
||
120 |
################################################################################ |
|
121 |
# This macro translates $ into $$ to protect the string from make itself. |
|
122 |
DoubleDollar = $(subst $$,$$$$,$(strip $1)) |
|
123 |
||
124 |
################################################################################ |
|
125 |
||
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
126 |
# If the variable that you want to send to stdout for piping into a file or otherwise, |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
127 |
# is potentially long, for example the a list of file paths, eg a list of all package directories. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
128 |
# Then you need to use ListPathsSafely, which optimistically splits the output into several shell |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
129 |
# calls as well as use compression on recurrent file paths segments, to get around the potential |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
130 |
# command line length problem that exists in cygwin and other shells. |
21759 | 131 |
compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl)) |
132 |
compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
133 |
compress_paths=$(compress_pre)\ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
134 |
$(subst $(SRC_ROOT),X97,\ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
135 |
$(subst $(OUTPUT_ROOT),X98,\ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
136 |
$(subst X,X00,\ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
137 |
$(subst $(SPACE),\n,$(strip $1)))))\ |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
138 |
$(compress_post) |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
139 |
|
21759 | 140 |
decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \ |
20363 | 141 |
-e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \ |
142 |
-e 's|X00|X|g' | tr '\n' '$2' |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
143 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
144 |
define ListPathsSafely_If |
20363 | 145 |
$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1))))) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
146 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
147 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
148 |
define ListPathsSafely_Printf |
20364 | 149 |
$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \ |
25854 | 150 |
-- "$(strip $(call EscapeDollar, $($1_LPS$4)))\n" | $(decompress_paths) $3) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
151 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
152 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
153 |
# Receipt example: |
20363 | 154 |
# rm -f thepaths |
155 |
# $(call ListPathsSafely,THEPATHS,\n, >> thepaths) |
|
156 |
# The \n argument means translate spaces into \n |
|
157 |
# if instead , , (a space) is supplied, then spaces remain spaces. |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
158 |
define ListPathsSafely |
20363 | 159 |
$(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!)) |
20364 | 160 |
$(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3' |
20363 | 161 |
$(call ListPathsSafely_If,$1,$2,1,250) |
162 |
$(call ListPathsSafely_If,$1,$2,251,500) |
|
163 |
$(call ListPathsSafely_If,$1,$2,501,750) |
|
164 |
$(call ListPathsSafely_If,$1,$2,751,1000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
165 |
|
20363 | 166 |
$(call ListPathsSafely_If,$1,$2,1001,1250) |
167 |
$(call ListPathsSafely_If,$1,$2,1251,1500) |
|
168 |
$(call ListPathsSafely_If,$1,$2,1501,1750) |
|
169 |
$(call ListPathsSafely_If,$1,$2,1751,2000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
170 |
|
20363 | 171 |
$(call ListPathsSafely_If,$1,$2,2001,2250) |
172 |
$(call ListPathsSafely_If,$1,$2,2251,2500) |
|
173 |
$(call ListPathsSafely_If,$1,$2,2501,2750) |
|
174 |
$(call ListPathsSafely_If,$1,$2,2751,3000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
175 |
|
20363 | 176 |
$(call ListPathsSafely_If,$1,$2,3001,3250) |
177 |
$(call ListPathsSafely_If,$1,$2,3251,3500) |
|
178 |
$(call ListPathsSafely_If,$1,$2,3501,3750) |
|
179 |
$(call ListPathsSafely_If,$1,$2,3751,4000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
180 |
|
20363 | 181 |
$(call ListPathsSafely_If,$1,$2,4001,4250) |
182 |
$(call ListPathsSafely_If,$1,$2,4251,4500) |
|
183 |
$(call ListPathsSafely_If,$1,$2,4501,4750) |
|
184 |
$(call ListPathsSafely_If,$1,$2,4751,5000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
185 |
|
20363 | 186 |
$(call ListPathsSafely_If,$1,$2,5001,5250) |
187 |
$(call ListPathsSafely_If,$1,$2,5251,5500) |
|
188 |
$(call ListPathsSafely_If,$1,$2,5501,5750) |
|
189 |
$(call ListPathsSafely_If,$1,$2,5751,6000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
190 |
|
20363 | 191 |
$(call ListPathsSafely_If,$1,$2,6001,6250) |
192 |
$(call ListPathsSafely_If,$1,$2,6251,6500) |
|
193 |
$(call ListPathsSafely_If,$1,$2,6501,6750) |
|
194 |
$(call ListPathsSafely_If,$1,$2,6751,7000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
195 |
|
20363 | 196 |
$(call ListPathsSafely_If,$1,$2,7001,7250) |
197 |
$(call ListPathsSafely_If,$1,$2,7251,7500) |
|
198 |
$(call ListPathsSafely_If,$1,$2,7501,7750) |
|
199 |
$(call ListPathsSafely_If,$1,$2,7751,8000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
200 |
|
20363 | 201 |
$(call ListPathsSafely_If,$1,$2,8001,8250) |
202 |
$(call ListPathsSafely_If,$1,$2,8251,8500) |
|
203 |
$(call ListPathsSafely_If,$1,$2,8501,8750) |
|
204 |
$(call ListPathsSafely_If,$1,$2,8751,9000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
205 |
|
20363 | 206 |
$(call ListPathsSafely_If,$1,$2,9001,9250) |
207 |
$(call ListPathsSafely_If,$1,$2,9251,9500) |
|
208 |
$(call ListPathsSafely_If,$1,$2,9501,9750) |
|
209 |
$(call ListPathsSafely_If,$1,$2,9751,10000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
210 |
|
20363 | 211 |
$(call ListPathsSafely_If,$1,$2,10001,10250) |
212 |
$(call ListPathsSafely_If,$1,$2,10251,10500) |
|
213 |
$(call ListPathsSafely_If,$1,$2,10501,10750) |
|
214 |
$(call ListPathsSafely_If,$1,$2,10751,11000) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
215 |
|
20363 | 216 |
$(call ListPathsSafely_If,$1,$2,11001,11250) |
217 |
$(call ListPathsSafely_If,$1,$2,11251,11500) |
|
218 |
$(call ListPathsSafely_If,$1,$2,11501,11750) |
|
219 |
$(call ListPathsSafely_If,$1,$2,11751,12000) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
220 |
|
20363 | 221 |
$(call ListPathsSafely_If,$1,$2,12001,12250) |
222 |
$(call ListPathsSafely_If,$1,$2,12251,12500) |
|
223 |
$(call ListPathsSafely_If,$1,$2,12501,12750) |
|
224 |
$(call ListPathsSafely_If,$1,$2,12751,13000) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
225 |
|
20363 | 226 |
$(call ListPathsSafely_If,$1,$2,13001,13250) |
227 |
$(call ListPathsSafely_If,$1,$2,13251,13500) |
|
228 |
$(call ListPathsSafely_If,$1,$2,13501,13750) |
|
229 |
$(call ListPathsSafely_If,$1,$2,13751,14000) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
230 |
|
20363 | 231 |
$(call ListPathsSafely_If,$1,$2,14001,14250) |
232 |
$(call ListPathsSafely_If,$1,$2,14251,14500) |
|
233 |
$(call ListPathsSafely_If,$1,$2,14501,14750) |
|
234 |
$(call ListPathsSafely_If,$1,$2,14751,15000) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
235 |
|
20363 | 236 |
$(call ListPathsSafely_If,$1,$2,15001,15250) |
237 |
$(call ListPathsSafely_If,$1,$2,15251,15500) |
|
238 |
$(call ListPathsSafely_If,$1,$2,15501,15750) |
|
239 |
$(call ListPathsSafely_If,$1,$2,15751,16000) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
240 |
|
20363 | 241 |
$(call ListPathsSafely_Printf,$1,$2,$3,1) |
242 |
$(call ListPathsSafely_Printf,$1,$2,$3,251) |
|
243 |
$(call ListPathsSafely_Printf,$1,$2,$3,501) |
|
244 |
$(call ListPathsSafely_Printf,$1,$2,$3,751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
245 |
|
20363 | 246 |
$(call ListPathsSafely_Printf,$1,$2,$3,1001) |
247 |
$(call ListPathsSafely_Printf,$1,$2,$3,1251) |
|
248 |
$(call ListPathsSafely_Printf,$1,$2,$3,1501) |
|
249 |
$(call ListPathsSafely_Printf,$1,$2,$3,1751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
250 |
|
20363 | 251 |
$(call ListPathsSafely_Printf,$1,$2,$3,2001) |
252 |
$(call ListPathsSafely_Printf,$1,$2,$3,2251) |
|
253 |
$(call ListPathsSafely_Printf,$1,$2,$3,2501) |
|
254 |
$(call ListPathsSafely_Printf,$1,$2,$3,2751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
255 |
|
20363 | 256 |
$(call ListPathsSafely_Printf,$1,$2,$3,3001) |
257 |
$(call ListPathsSafely_Printf,$1,$2,$3,3251) |
|
258 |
$(call ListPathsSafely_Printf,$1,$2,$3,3501) |
|
259 |
$(call ListPathsSafely_Printf,$1,$2,$3,3751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
260 |
|
20363 | 261 |
$(call ListPathsSafely_Printf,$1,$2,$3,4001) |
262 |
$(call ListPathsSafely_Printf,$1,$2,$3,4251) |
|
263 |
$(call ListPathsSafely_Printf,$1,$2,$3,4501) |
|
264 |
$(call ListPathsSafely_Printf,$1,$2,$3,4751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
265 |
|
20363 | 266 |
$(call ListPathsSafely_Printf,$1,$2,$3,5001) |
267 |
$(call ListPathsSafely_Printf,$1,$2,$3,5251) |
|
268 |
$(call ListPathsSafely_Printf,$1,$2,$3,5501) |
|
269 |
$(call ListPathsSafely_Printf,$1,$2,$3,5751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
270 |
|
20363 | 271 |
$(call ListPathsSafely_Printf,$1,$2,$3,6001) |
272 |
$(call ListPathsSafely_Printf,$1,$2,$3,6251) |
|
273 |
$(call ListPathsSafely_Printf,$1,$2,$3,6501) |
|
274 |
$(call ListPathsSafely_Printf,$1,$2,$3,6751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
275 |
|
20363 | 276 |
$(call ListPathsSafely_Printf,$1,$2,$3,7001) |
277 |
$(call ListPathsSafely_Printf,$1,$2,$3,7251) |
|
278 |
$(call ListPathsSafely_Printf,$1,$2,$3,7501) |
|
279 |
$(call ListPathsSafely_Printf,$1,$2,$3,7751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
280 |
|
20363 | 281 |
$(call ListPathsSafely_Printf,$1,$2,$3,8001) |
282 |
$(call ListPathsSafely_Printf,$1,$2,$3,8251) |
|
283 |
$(call ListPathsSafely_Printf,$1,$2,$3,8501) |
|
284 |
$(call ListPathsSafely_Printf,$1,$2,$3,8751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
285 |
|
20363 | 286 |
$(call ListPathsSafely_Printf,$1,$2,$3,9001) |
287 |
$(call ListPathsSafely_Printf,$1,$2,$3,9251) |
|
288 |
$(call ListPathsSafely_Printf,$1,$2,$3,9501) |
|
289 |
$(call ListPathsSafely_Printf,$1,$2,$3,9751) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
290 |
|
20363 | 291 |
$(call ListPathsSafely_Printf,$1,$2,$3,10001) |
292 |
$(call ListPathsSafely_Printf,$1,$2,$3,10251) |
|
293 |
$(call ListPathsSafely_Printf,$1,$2,$3,10501) |
|
294 |
$(call ListPathsSafely_Printf,$1,$2,$3,10751) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
295 |
|
20363 | 296 |
$(call ListPathsSafely_Printf,$1,$2,$3,11001) |
297 |
$(call ListPathsSafely_Printf,$1,$2,$3,11251) |
|
298 |
$(call ListPathsSafely_Printf,$1,$2,$3,11501) |
|
299 |
$(call ListPathsSafely_Printf,$1,$2,$3,11751) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
300 |
|
20363 | 301 |
$(call ListPathsSafely_Printf,$1,$2,$3,12001) |
302 |
$(call ListPathsSafely_Printf,$1,$2,$3,12251) |
|
303 |
$(call ListPathsSafely_Printf,$1,$2,$3,12501) |
|
304 |
$(call ListPathsSafely_Printf,$1,$2,$3,12751) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
305 |
|
20363 | 306 |
$(call ListPathsSafely_Printf,$1,$2,$3,13001) |
307 |
$(call ListPathsSafely_Printf,$1,$2,$3,13251) |
|
308 |
$(call ListPathsSafely_Printf,$1,$2,$3,13501) |
|
309 |
$(call ListPathsSafely_Printf,$1,$2,$3,13751) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
310 |
|
20363 | 311 |
$(call ListPathsSafely_Printf,$1,$2,$3,14001) |
312 |
$(call ListPathsSafely_Printf,$1,$2,$3,14251) |
|
313 |
$(call ListPathsSafely_Printf,$1,$2,$3,14501) |
|
314 |
$(call ListPathsSafely_Printf,$1,$2,$3,14751) |
|
14279
1c596d0f411c
8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents:
14111
diff
changeset
|
315 |
|
20363 | 316 |
$(call ListPathsSafely_Printf,$1,$2,$3,15001) |
317 |
$(call ListPathsSafely_Printf,$1,$2,$3,15251) |
|
318 |
$(call ListPathsSafely_Printf,$1,$2,$3,15501) |
|
319 |
$(call ListPathsSafely_Printf,$1,$2,$3,15751) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
320 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
321 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
322 |
define ListPathsSafelyNow_IfPrintf |
20363 | 323 |
ifneq (,$$(word $4,$$($1))) |
324 |
$$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1)))) |
|
325 |
$$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3) |
|
326 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
327 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
328 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
329 |
# And an non-receipt version: |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
330 |
define ListPathsSafelyNow |
20363 | 331 |
ifneq (,$$(word 10001,$$($1))) |
332 |
$$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!) |
|
333 |
endif |
|
334 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250) |
|
335 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500) |
|
336 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750) |
|
337 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
338 |
|
20363 | 339 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250) |
340 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500) |
|
341 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750) |
|
342 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
343 |
|
20363 | 344 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250) |
345 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500) |
|
346 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750) |
|
347 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
348 |
|
20363 | 349 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250) |
350 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500) |
|
351 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750) |
|
352 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
353 |
|
20363 | 354 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250) |
355 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500) |
|
356 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750) |
|
357 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
358 |
|
20363 | 359 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250) |
360 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500) |
|
361 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750) |
|
362 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
363 |
|
20363 | 364 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250) |
365 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500) |
|
366 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750) |
|
367 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
368 |
|
20363 | 369 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250) |
370 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500) |
|
371 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750) |
|
372 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
373 |
|
20363 | 374 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250) |
375 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500) |
|
376 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750) |
|
377 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
378 |
|
20363 | 379 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250) |
380 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500) |
|
381 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750) |
|
382 |
$(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
383 |
|
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
384 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
385 |
|
12801 | 386 |
# The source tips can come from the Mercurial repository, or in the files |
20363 | 387 |
# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same |
388 |
# directory as the original $(HGDIR) directory. |
|
389 |
# These should not be := assignments, only used from the root Makefile. |
|
12801 | 390 |
HG_VERSION = $(shell $(HG) version 2> /dev/null) |
391 |
HG_DIRECTORY=.hg |
|
392 |
HGTIP_FILENAME=.hgtip |
|
393 |
HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO |
|
394 |
REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \ |
|
31219
86afedc80683
8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
erikj
parents:
30095
diff
changeset
|
395 |
$(shell $(CD) $(SRC_ROOT) ; \ |
86afedc80683
8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
erikj
parents:
30095
diff
changeset
|
396 |
$(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) \ |
86afedc80683
8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
erikj
parents:
30095
diff
changeset
|
397 |
$(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) \ |
20363 | 398 |
2> /dev/null))))) |
12801 | 399 |
|
400 |
# Emit the repo:tip pairs to $@ |
|
401 |
define GetSourceTips |
|
20363 | 402 |
$(CD) $(SRC_ROOT) ; \ |
403 |
for i in $(REPO_LIST) IGNORE ; do \ |
|
404 |
if [ "$${i}" = "IGNORE" ] ; then \ |
|
405 |
continue; \ |
|
406 |
elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \ |
|
407 |
$(PRINTF) " %s:%s" \ |
|
408 |
"$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \ |
|
409 |
elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \ |
|
410 |
$(PRINTF) " %s:%s" \ |
|
411 |
"$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \ |
|
412 |
fi; \ |
|
413 |
done >> $@ |
|
414 |
$(PRINTF) "\n" >> $@ |
|
12801 | 415 |
endef |
416 |
||
417 |
# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk |
|
418 |
define CreateHgTip |
|
20363 | 419 |
$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \ |
420 |
$(ECHO) $1/$(HGTIP_FILENAME) |
|
12801 | 421 |
endef |
422 |
||
423 |
define SetupLogging |
|
29662 | 424 |
ifeq ($$(LOG_LEVEL), trace) |
20363 | 425 |
# Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make |
426 |
# For each target executed, will print |
|
427 |
# Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer) |
|
428 |
# but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much |
|
429 |
# (and causing a crash on Cygwin). |
|
430 |
# Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris. |
|
431 |
# Only use time if it's GNU time which supports format and output file. |
|
29662 | 432 |
WRAPPER_SHELL := $$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(SHELL) |
433 |
SHELL := $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL) |
|
20363 | 434 |
endif |
435 |
# Never remove warning messages; this is just for completeness |
|
29662 | 436 |
LOG_WARN := |
437 |
ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),) |
|
438 |
LOG_INFO := |
|
20363 | 439 |
else |
29662 | 440 |
LOG_INFO := > /dev/null |
20363 | 441 |
endif |
29662 | 442 |
ifneq ($$(findstring $$(LOG_LEVEL), debug trace),) |
443 |
LOG_DEBUG := |
|
20363 | 444 |
else |
29662 | 445 |
LOG_DEBUG := > /dev/null |
20363 | 446 |
endif |
29662 | 447 |
ifneq ($$(findstring $$(LOG_LEVEL), trace),) |
448 |
LOG_TRACE := |
|
20363 | 449 |
else |
29662 | 450 |
LOG_TRACE := > /dev/null |
20363 | 451 |
endif |
12801 | 452 |
endef |
453 |
||
454 |
# Make sure logging is setup for everyone that includes MakeBase.gmk. |
|
455 |
$(eval $(call SetupLogging)) |
|
456 |
||
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
457 |
################################################################################ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
458 |
# Creates a sequence of increasing numbers (inclusive). |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
459 |
# Param 1 - starting number |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
460 |
# Param 2 - ending number |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
461 |
sequence = \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
462 |
$(wordlist $1, $2, $(strip \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
463 |
$(eval SEQUENCE_COUNT :=) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
464 |
$(call _sequence-do,$(strip $2)))) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
465 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
466 |
_sequence-do = \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
467 |
$(if $(word $1, $(SEQUENCE_COUNT)),, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
468 |
$(eval SEQUENCE_COUNT += .) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
469 |
$(words $(SEQUENCE_COUNT)) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
470 |
$(call _sequence-do,$1)) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
471 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
472 |
################################################################################ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
473 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
474 |
MAX_PARAMS := 30 |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
475 |
PARAM_SEQUENCE := $(call sequence, 2, $(MAX_PARAMS)) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
476 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
477 |
# 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
|
478 |
# 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
|
479 |
# 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
|
480 |
# 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
|
481 |
# of the macro. |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
482 |
# Ex: |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
483 |
# SetupFoo = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
484 |
# define SetupFooBody |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
485 |
# # do something |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
486 |
# # access parameters as $$($1_BAR) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
487 |
# endef |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
488 |
# Call it like this |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
489 |
# $(eval $(call SetupFoo, BUILD_SOMETHING, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
490 |
# BAR := some parameter value, \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
491 |
# )) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
492 |
define NamedParamsMacroTemplate |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
493 |
$(if $($(MAX_PARAMS)),$(error Internal makefile error: \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
494 |
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
|
495 |
# 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
|
496 |
$(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
497 |
$(strip $1)_$(strip $($i)))$(NEWLINE)) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
498 |
# Debug print all named parameter names and values |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
499 |
$(if $(findstring $(LOG_LEVEL),debug trace), \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
500 |
$(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
501 |
$(if $(strip $($i)),$(NEWLINE) $(strip [$i] $(if $(filter $(LOG_LEVEL), trace), \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
502 |
$($i), $(wordlist 1, 20, $($(i))) $(if $(word 21, $($(i))), ...))))))) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
503 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
504 |
$(if $(DEBUG_$(strip $1)), |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
505 |
$(info -------- <<< Begin expansion of $(strip $1)) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
506 |
$(info $(call $(0)Body,$(strip $1))) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
507 |
$(info -------- >>> End expansion of $(strip $1)) \ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
508 |
) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
509 |
|
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
510 |
$(call $(0)Body,$(strip $1)) |
14111 | 511 |
endef |
512 |
||
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
513 |
################################################################################ |
14111 | 514 |
# Make directory without forking mkdir if not needed |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
515 |
MakeDir = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
516 |
$(strip $(if $(subst $(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),,$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9)),\ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
517 |
$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9))) |
14111 | 518 |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
519 |
################################################################################ |
29866
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
520 |
# Assign a variable only if it is empty |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
521 |
# Param 1 - Variable to assign |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
522 |
# Param 2 - Value to assign |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
523 |
SetIfEmpty = \ |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
524 |
$(if $($(strip $1)),,$(eval $(strip $1) := $2)) |
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
525 |
|
6cecef2d84ab
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29861
diff
changeset
|
526 |
################################################################################ |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
527 |
|
14111 | 528 |
ifeq ($(OPENJDK_TARGET_OS),solaris) |
20363 | 529 |
# On Solaris, if the target is a symlink and exists, cp won't overwrite. |
530 |
# Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the |
|
531 |
# 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
|
532 |
# 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
|
533 |
# so we fall back on regular copy, which isn't preserving symlinks. |
20363 | 534 |
define install-file |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
535 |
$(MKDIR) -p '$(@D)' |
14111 | 536 |
$(RM) '$@' |
23168
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
537 |
if [ "$(@D)" != "$(<D)" ]; then \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
538 |
$(CP) -f -r -P '$<' '$(@D)'; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
539 |
if [ "$(@F)" != "$(<F)" ]; then \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
540 |
$(MV) '$(@D)/$(<F)' '$@'; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
541 |
fi; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
542 |
else \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
543 |
if [ -L '$<' ]; then \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
544 |
$(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
|
545 |
exit 1; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
546 |
fi; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
547 |
$(CP) -f '$<' '$@'; \ |
d20a4165e3d2
8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents:
21759
diff
changeset
|
548 |
fi |
20363 | 549 |
endef |
14111 | 550 |
else ifeq ($(OPENJDK_TARGET_OS),macosx) |
20363 | 551 |
# On mac, extended attributes sometimes creep into the source files, which may later |
552 |
# cause the creation of ._* files which confuses testing. Clear these with xattr if |
|
553 |
# set. Some files get their write permissions removed after being copied to the |
|
554 |
# output dir. When these are copied again to images, xattr would fail. By only clearing |
|
555 |
# attributes when they are present, failing on this is avoided. |
|
556 |
define install-file |
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
557 |
$(MKDIR) -p '$(@D)' |
16580
6acb502beafa
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
16419
diff
changeset
|
558 |
$(CP) -fRP '$<' '$@' |
6acb502beafa
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
16419
diff
changeset
|
559 |
if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi |
20363 | 560 |
endef |
14111 | 561 |
else |
25854 | 562 |
# Running mkdir and cp in the same shell speeds up copy intensive tasks in Cygwin |
563 |
# significantly. |
|
20363 | 564 |
define install-file |
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27592
diff
changeset
|
565 |
$(MKDIR) -p '$(@D)' && $(CP) -fP '$<' '$@' |
20363 | 566 |
endef |
14111 | 567 |
endif |
568 |
||
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
569 |
################################################################################ |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
570 |
# Convenience functions for working around make's limitations with $(filter ). |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
571 |
containing = \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
572 |
$(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),$v))) |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
573 |
not-containing = \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
574 |
$(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),,$v))) |
25854 | 575 |
|
576 |
# 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
|
577 |
uniq = \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
578 |
$(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
|
579 |
|
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
580 |
# 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
|
581 |
dups = \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
582 |
$(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \ |
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
583 |
$(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
|
584 |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
585 |
# String equals |
28607
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
586 |
equals = \ |
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
587 |
$(and $(findstring $(strip $1),$(strip $2)),\ |
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
588 |
$(findstring $(strip $2),$(strip $1))) |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
589 |
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
590 |
# 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
|
591 |
# $1 - List of prefixes |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
592 |
# $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
|
593 |
remove-prefixes = \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29866
diff
changeset
|
594 |
$(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
|
595 |
$(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
|
596 |
|
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
597 |
################################################################################ |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
598 |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
599 |
ifneq ($(DISABLE_CACHE_FIND), true) |
23984 | 600 |
# In Cygwin, finds are very costly, both because of expensive forks and because |
601 |
# of bad file system caching. Find is used extensively in $(shell) commands to |
|
602 |
# find source files. This makes rerunning make with no or few changes rather |
|
603 |
# expensive. To speed this up, these two macros are used to cache the results |
|
604 |
# of simple find commands for reuse. |
|
605 |
# |
|
606 |
# Runs a find and stores both the directories where it was run and the results. |
|
607 |
# This macro can be called multiple times to add to the cache. Only finds files |
|
608 |
# with no filters. |
|
609 |
# |
|
610 |
# Needs to be called with $(eval ) |
|
611 |
# |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
612 |
# 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
|
613 |
# functionality active unless explicitly disabled to exercise it more. |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
614 |
# |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
615 |
# 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
|
616 |
FIND_CACHE_DIRS := |
23984 | 617 |
# Param 1 - Dirs to find in |
618 |
# Param 2 - (optional) specialization. Normally "-a \( ... \)" expression. |
|
20363 | 619 |
define FillCacheFind |
23984 | 620 |
# 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
|
621 |
# since filter out will then return empty. |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
622 |
FIND_CACHE_NEW_DIRS := $$(filter-out $$(addsuffix /%,\ |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
623 |
- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS), $1) |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
624 |
ifneq ($$(FIND_CACHE_NEW_DIRS), ) |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
625 |
# 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
|
626 |
FIND_CACHE_DIRS += $$(patsubst %/,%, $$(FIND_CACHE_NEW_DIRS)) |
23984 | 627 |
FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $$(FIND_CACHE_NEW_DIRS) \( -type f -o -type l \) $2)) |
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
628 |
endif |
20363 | 629 |
endef |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
630 |
|
23984 | 631 |
# Mimics find by looking in the cache if all of the directories have been cached. |
632 |
# Otherwise reverts to shell find. This is safe to call on all platforms, even if |
|
633 |
# cache is deactivated. |
|
634 |
# |
|
25854 | 635 |
# $1 can be either a directory or a file. If it's a directory, make |
636 |
# sure we have exactly one trailing slash before the wildcard. |
|
23984 | 637 |
# The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless. |
638 |
# |
|
639 |
# Param 1 - Dirs to find in |
|
640 |
# Param 2 - (optional) specialization. Normally "-a \( ... \)" expression. |
|
641 |
define CacheFind |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
642 |
$(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \ |
23984 | 643 |
$(shell $(FIND) $1 \( -type f -o -type l \) $2), \ |
25854 | 644 |
$(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(FIND_CACHE))) |
23984 | 645 |
endef |
25854 | 646 |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
647 |
else |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
648 |
# If CacheFind is disabled, just run the find command. |
23984 | 649 |
# Param 1 - Dirs to find in |
650 |
# Param 2 - (optional) specialization. Normally "-a \( ... \)" expression. |
|
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
651 |
define CacheFind |
23984 | 652 |
$(shell $(FIND) $1 \( -type f -o -type l \) $2) |
23170
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
653 |
endef |
51e606ecede5
8037281: Improve CacheFind and enable on all platforms
erikj
parents:
23169
diff
changeset
|
654 |
endif |
15051
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
655 |
|
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
656 |
################################################################################ |
d32ad37472e6
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14279
diff
changeset
|
657 |
|
25854 | 658 |
define AddFileToCopy |
659 |
# Helper macro for SetupCopyFiles |
|
660 |
# 1 : Source file |
|
661 |
# 2 : Dest file |
|
662 |
# 3 : Variable to add targets to |
|
663 |
# 4 : Macro to call for copy operation |
|
664 |
$2: $1 |
|
665 |
$(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@) |
|
666 |
$$($$(strip $4)) |
|
667 |
||
668 |
$3 += $2 |
|
669 |
endef |
|
670 |
||
28902
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
671 |
# 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
|
672 |
# processing instead of copying. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
673 |
# |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
674 |
# 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
|
675 |
# 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
|
676 |
# |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
677 |
# Remaining parameters are named arguments. These include: |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
678 |
# SRC : Source root dir (defaults to dir of first file) |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
679 |
# DEST : Dest root dir |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
680 |
# 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
|
681 |
# Must be in SRC. |
0c09b47449c8
8069064: Various improvements and fixes in build system
ihse
parents:
28901
diff
changeset
|
682 |
# 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
|
683 |
# 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
|
684 |
# Default is 'install-file' |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
685 |
SetupCopyFiles = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
29304
diff
changeset
|
686 |
define SetupCopyFilesBody |
25854 | 687 |
|
688 |
ifeq ($$($1_MACRO), ) |
|
689 |
$1_MACRO := install-file |
|
690 |
endif |
|
691 |
||
28901
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
692 |
# 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
|
693 |
ifeq ($$($1_SRC), ) |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
694 |
$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
|
695 |
endif |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
696 |
|
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
697 |
# Remove any trailing slash from SRC |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
698 |
$1_SRC := $$(patsubst %/,%,$$($1_SRC)) |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27595
diff
changeset
|
699 |
|
25854 | 700 |
$$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \ |
701 |
$$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \ |
|
702 |
$$($1_DEST)/$$(if $$($1_FLATTEN),$$(notdir $$f),$$f), $1, $$($1_MACRO)))) |
|
703 |
||
704 |
endef |
|
705 |
||
706 |
################################################################################ |
|
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
707 |
# ShellQuote |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
708 |
# |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
709 |
# 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
|
710 |
# that the contents survives being given to the shell. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
711 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
712 |
ShellQuote = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
713 |
$(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
714 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
715 |
################################################################################ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
716 |
# Write to and read from file |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
717 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
718 |
# Param 1 - File to read |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
719 |
ReadFile = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
720 |
$(shell $(CAT) $1) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
721 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
722 |
# Param 1 - Text to write |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
723 |
# Param 2 - File to write to |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
724 |
# Use printf to get consistent behavior on all platforms. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
725 |
WriteFile = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
726 |
$(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
727 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
728 |
################################################################################ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
729 |
# DependOnVariable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
730 |
# |
29156
bd932374081c
8072842: Add support for building native JTReg tests
ihse
parents:
28906
diff
changeset
|
731 |
# 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
|
732 |
# 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
|
733 |
# 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
|
734 |
# 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
|
735 |
# |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
736 |
# path/to/some-file: $(call DependOnVariable, SOME_VAR) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
737 |
# echo $(SOME_VAR) > $@ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
738 |
# |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
739 |
# 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
|
740 |
# |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
741 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
742 |
# 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
|
743 |
DependOnVariableDirName = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
744 |
$(strip $(subst $(SRC_ROOT)/,,\ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
745 |
$(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
746 |
$(firstword $(MAKEFILE_LIST)), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
747 |
$(CURDIR)/$(firstword $(MAKEFILE_LIST))))) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
748 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
749 |
# 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
|
750 |
# unless parameter 2 is given. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
751 |
# Param 1 - Name of variable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
752 |
# Param 2 - (optional) name of file to store value in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
753 |
DependOnVariableFileName = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
754 |
$(strip $(if $(strip $2), $2, \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
755 |
$(MAKESUPPORT_OUTPUTDIR)/vardeps/$(DependOnVariableDirName)/$(strip $1).vardeps)) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
756 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
757 |
# Does the actual work with parameters stripped. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
758 |
# 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
|
759 |
# else print a new file. |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
760 |
# 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
|
761 |
# Param 1 - Name of variable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
762 |
# Param 2 - (optional) name of file to store value in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
763 |
DependOnVariableHelper = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
764 |
$(strip $(if $(and $(wildcard $(call DependOnVariableFileName, $1, $2)),\ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
765 |
$(call equals, $(strip $($1)), \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
766 |
$(call ReadFile, $(call DependOnVariableFileName, $1, $2)))),,\ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
767 |
$(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
768 |
$(if $(findstring $(LOG_LEVEL), trace), \ |
28607
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
769 |
$(info Variable $1: >$(strip $($1))<) \ |
380f123263d8
8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents:
28606
diff
changeset
|
770 |
$(info File: >$(call ReadFile, $(call DependOnVariableFileName, $1, $2))<)) \ |
28600
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
771 |
$(call WriteFile, $($1), $(call DependOnVariableFileName, $1, $2))) \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
772 |
$(call DependOnVariableFileName, $1, $2)) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
773 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
774 |
# Main macro |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
775 |
# Param 1 - Name of variable |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
776 |
# Param 2 - (optional) name of file to store value in |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
777 |
DependOnVariable = \ |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
778 |
$(call DependOnVariableHelper,$(strip $1),$(strip $2)) |
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
779 |
|
09dd1740f176
8069261: Create make dependencies on make variable values
erikj
parents:
27595
diff
changeset
|
780 |
################################################################################ |
32344
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
781 |
# Failure logging support macros. These are supposed to be used by the Setup* |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
782 |
# compilation macros. |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
783 |
# |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
784 |
# LogFailures will run a command and store a copy of output in a specified file. |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
785 |
# If the command succeeds, the file is deleted, otherwise it is moved to the |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
786 |
# failure-logs directory. |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
787 |
# Param 1 - The log file of the failed command |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
788 |
# Param 2 - A compact but representative name to describe this command |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
789 |
# Param 3 - Command to run |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
790 |
LogFailures = \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
791 |
( ($(BASH) $(SRC_ROOT)/common/bin/logger.sh $1 $3 && $(RM) $1) || \ |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
792 |
(exitcode=$(DOLLAR)$(DOLLAR)? && $(MV) $1 $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(strip $2).log && exit $(DOLLAR)$(DOLLAR)exitcode) ) |
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
793 |
|
0b288e0efcfa
8062618: Create a build failure summary at end of build log
ihse
parents:
31312
diff
changeset
|
794 |
################################################################################ |
31310 | 795 |
# Find lib dir for module |
796 |
# Param 1 - module name |
|
797 |
ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) |
|
798 |
FindLibDirForModule = \ |
|
799 |
$(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR) |
|
800 |
else |
|
801 |
FindLibDirForModule = \ |
|
802 |
$(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1) |
|
803 |
endif |
|
804 |
||
805 |
################################################################################ |
|
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
806 |
# Return a string suitable for use after a -classpath option. It will correct and safe to use |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
807 |
# on all platforms. Arguments are given as space separate classpath entries. |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
808 |
# param 1 : A space separated list of classpath entries |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
809 |
# The surrounding strip is needed to keep additional whitespace out |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
810 |
PathList = \ |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
811 |
"$(subst $(SPACE),$(PATH_SEP),$(strip $1))" |
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
812 |
|
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32344
diff
changeset
|
813 |
################################################################################ |
25854 | 814 |
|
815 |
# Hook to include the corresponding custom file, if present. |
|
816 |
$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk)) |
|
817 |
||
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
818 |
endif # _MAKEBASE_GMK |