Print this page
rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn
Split |
Split |
Close |
Expand all |
Collapse all |
--- old/make/bsd/makefiles/buildtree.make
+++ new/make/bsd/makefiles/buildtree.make
1 1 #
2 2 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation.
8 8 #
9 9 # This code is distributed in the hope that it will be useful, but WITHOUT
10 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 # version 2 for more details (a copy is included in the LICENSE file that
13 13 # accompanied this code).
14 14 #
15 15 # You should have received a copy of the GNU General Public License version
16 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 #
19 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 # or visit www.oracle.com if you need additional information or have any
21 21 # questions.
22 22 #
23 23 #
24 24
25 25 # Usage:
26 26 #
27 27 # $(MAKE) -f buildtree.make SRCARCH=srcarch BUILDARCH=buildarch LIBARCH=libarch
28 28 # GAMMADIR=dir OS_FAMILY=os VARIANT=variant
↓ open down ↓ |
28 lines elided |
↑ open up ↑ |
29 29 #
30 30 # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the
31 31 # environment or on the command-line:
32 32 #
33 33 # ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory
34 34 # BUILDARCH - build directory
35 35 # LIBARCH - the corresponding directory in JDK/JRE
36 36 # GAMMADIR - top of workspace
37 37 # OS_FAMILY - operating system
38 38 # VARIANT - core, compiler1, compiler2, or tiered
39 -# HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
39 +# HOTSPOT_RELEASE_VERSION - <major_ver>.<minor_ver>.<micro_ver>[-<identifier>][-<debug_target>][-b<nn>]
40 40 # HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty
41 41 # JRE_RELEASE_VERSION - <major>.<minor>.<micro> (1.7.0)
42 42 #
43 43 # Builds the directory trees with makefiles plus some convenience files in
44 44 # each directory:
45 45 #
46 46 # Makefile - for "make foo"
47 47 # flags.make - with macro settings
48 48 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles
49 49 # adlc.make -
50 50 # trace.make - generate tracing event and type definitions
51 51 # jvmti.make - generate JVMTI bindings from the spec (JSR-163)
52 52 # sa.make - generate SA jar file and natives
53 53 #
54 54 # The makefiles are split this way so that "make foo" will run faster by not
55 55 # having to read the dependency files for the vm.
56 56
57 57 # needs to be set here since this Makefile doesn't include defs.make
58 58 OS_VENDOR:=$(shell uname -s)
59 59
60 60 -include $(SPEC)
61 61 include $(GAMMADIR)/make/scm.make
62 62 include $(GAMMADIR)/make/defs.make
63 63 include $(GAMMADIR)/make/altsrc.make
64 64
65 65
66 66 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.
67 67 QUIETLY$(MAKE_VERBOSE) = @
68 68
69 69 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
70 70 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
71 71 else
72 72 ifdef USE_SUNCC
73 73 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
74 74 else
75 75 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
76 76 endif
77 77 endif
78 78
79 79 # Allow overriding of the arch part of the directory but default
80 80 # to BUILDARCH if nothing is specified
81 81 ifeq ($(VARIANTARCH),)
82 82 VARIANTARCH=$(BUILDARCH)
83 83 endif
84 84
85 85 ifdef FORCE_TIERED
86 86 ifeq ($(VARIANT),tiered)
87 87 PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_compiler2
88 88 else
89 89 PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
90 90 endif
91 91 else
92 92 PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
93 93 endif
94 94
95 95 #
96 96 # We do two levels of exclusion in the shared directory.
97 97 # TOPLEVEL excludes are pruned, they are not recursively searched,
98 98 # but lower level directories can be named without fear of collision.
99 99 # ALWAYS excludes are excluded at any level in the directory tree.
100 100 #
101 101
102 102 ALWAYS_EXCLUDE_DIRS = $(SCM_DIRS)
103 103
104 104 ifeq ($(VARIANT),tiered)
105 105 TOPLEVEL_EXCLUDE_DIRS = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name agent
106 106 else
107 107 ifeq ($(VARIANT),compiler2)
108 108 TOPLEVEL_EXCLUDE_DIRS = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name c1 -o -name agent
109 109 else
110 110 # compiler1 and core use the same exclude list
111 111 TOPLEVEL_EXCLUDE_DIRS = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name opto -o -name libadt -o -name agent
112 112 endif
113 113 endif
114 114
115 115 # Get things from the platform file.
116 116 COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE))
117 117
118 118 # dtracefiles is used on BSD versions that implement Dtrace (like MacOS X)
119 119 SIMPLE_DIRS = \
120 120 $(PLATFORM_DIR)/generated/dependencies \
121 121 $(PLATFORM_DIR)/generated/adfiles \
122 122 $(PLATFORM_DIR)/generated/jvmtifiles \
123 123 $(PLATFORM_DIR)/generated/tracefiles \
124 124 $(PLATFORM_DIR)/generated/dtracefiles
125 125
126 126 TARGETS = debug fastdebug optimized product
127 127 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
128 128
129 129 # For dependencies and recursive makes.
130 130 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
131 131
132 132 # dtrace.make is used on BSD versions that implement Dtrace (like MacOS X)
133 133 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make trace.make sa.make dtrace.make
134 134
135 135 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
136 136 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
137 137
138 138 # Define variables to be set in flags.make.
139 139 # Default values are set in make/defs.make.
140 140 ifeq ($(HOTSPOT_BUILD_VERSION),)
141 141 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)
142 142 else
143 143 HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)
144 144 endif
145 145 # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami)
146 146 ifndef HOTSPOT_BUILD_USER
147 147 HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME)
148 148 endif
149 149 ifndef HOTSPOT_BUILD_USER
150 150 HOTSPOT_BUILD_USER := $(shell whoami)
151 151 endif
152 152 # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
153 153 # or make/hotspot_distro.
154 154 ifndef HOTSPOT_VM_DISTRO
155 155 ifeq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
156 156 include $(GAMMADIR)/make/hotspot_distro
157 157 else
158 158 include $(GAMMADIR)/make/openjdk_distro
159 159 endif
160 160 endif
161 161
162 162 # if hotspot-only build and/or OPENJDK isn't passed down, need to set OPENJDK
163 163 ifndef OPENJDK
164 164 ifneq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
165 165 OPENJDK=true
166 166 endif
167 167 endif
168 168
169 169 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
170 170
171 171 BUILDTREE = \
172 172 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
173 173
174 174 BUILDTREE_COMMENT = echo "\# Generated by $(BUILDTREE_MAKE)"
175 175
176 176 all: $(SUBMAKE_DIRS)
177 177
178 178 # Run make in each subdirectory recursively.
179 179 $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE
180 180 $(QUIETLY) [ -d $@ ] || { mkdir -p $@; }
181 181 $(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F)
182 182 $(QUIETLY) touch $@
183 183
184 184 $(SIMPLE_DIRS):
185 185 $(QUIETLY) mkdir -p $@
186 186
187 187 # Convenience macro which takes a source relative path, applies $(1) to the
188 188 # absolute path, and then replaces $(GAMMADIR) in the result with a
189 189 # literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
190 190 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
191 191
192 192 # This bit is needed to enable local rebuilds.
193 193 # Unless the makefile itself sets LP64, any environmental
194 194 # setting of LP64 will interfere with the build.
195 195 LP64_SETTING/32 = LP64 = \#empty
196 196 LP64_SETTING/64 = LP64 = 1
197 197
198 198 DATA_MODE/i486 = 32
199 199 DATA_MODE/amd64 = 64
200 200
201 201 DATA_MODE = $(DATA_MODE/$(BUILDARCH))
202 202
203 203 flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
204 204 @echo Creating $@ ...
205 205 $(QUIETLY) ( \
206 206 $(BUILDTREE_COMMENT); \
207 207 echo; \
208 208 echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
209 209 sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
210 210 echo; \
211 211 echo "GAMMADIR = $(GAMMADIR)"; \
212 212 echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
213 213 echo "OSNAME = $(OSNAME)"; \
214 214 echo "SYSDEFS = \$$(Platform_sysdefs)"; \
215 215 echo "SRCARCH = $(SRCARCH)"; \
216 216 echo "BUILDARCH = $(BUILDARCH)"; \
217 217 echo "LIBARCH = $(LIBARCH)"; \
218 218 echo "TARGET = $(TARGET)"; \
219 219 echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \
220 220 echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
221 221 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
222 222 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
223 223 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
224 224 echo "OPENJDK = $(OPENJDK)"; \
225 225 echo "$(LP64_SETTING/$(DATA_MODE))"; \
226 226 echo; \
227 227 echo "# Used for platform dispatching"; \
228 228 echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
229 229 echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
230 230 echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \
231 231 echo "TARGET_DEFINES += -DTARGET_OS_ARCH_\$$(Platform_os_arch)"; \
232 232 echo "TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_\$$(Platform_os_arch_model)"; \
233 233 echo "TARGET_DEFINES += -DTARGET_COMPILER_\$$(Platform_compiler)"; \
234 234 echo "CFLAGS += \$$(TARGET_DEFINES)"; \
235 235 echo; \
236 236 echo "Src_Dirs_V = \\"; \
237 237 sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \
238 238 echo "$(call gamma-path,altsrc,cpu/$(SRCARCH)/vm) \\"; \
239 239 echo "$(call gamma-path,commonsrc,cpu/$(SRCARCH)/vm) \\"; \
240 240 echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
241 241 echo "$(call gamma-path,commonsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
242 242 echo "$(call gamma-path,altsrc,os/$(OS_FAMILY)/vm) \\"; \
243 243 echo "$(call gamma-path,commonsrc,os/$(OS_FAMILY)/vm) \\"; \
244 244 echo "$(call gamma-path,altsrc,os/posix/vm) \\"; \
245 245 echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
246 246 echo; \
247 247 echo "Src_Dirs_I = \\"; \
248 248 echo "$(call gamma-path,altsrc,share/vm/prims) \\"; \
249 249 echo "$(call gamma-path,commonsrc,share/vm/prims) \\"; \
250 250 echo "$(call gamma-path,altsrc,share/vm) \\"; \
251 251 echo "$(call gamma-path,commonsrc,share/vm) \\"; \
252 252 echo "$(call gamma-path,altsrc,share/vm/precompiled) \\"; \
253 253 echo "$(call gamma-path,commonsrc,share/vm/precompiled) \\"; \
254 254 echo "$(call gamma-path,altsrc,cpu/$(SRCARCH)/vm) \\"; \
255 255 echo "$(call gamma-path,commonsrc,cpu/$(SRCARCH)/vm) \\"; \
256 256 echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
257 257 echo "$(call gamma-path,commonsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
258 258 echo "$(call gamma-path,altsrc,os/$(OS_FAMILY)/vm) \\"; \
259 259 echo "$(call gamma-path,commonsrc,os/$(OS_FAMILY)/vm) \\"; \
260 260 echo "$(call gamma-path,altsrc,os/posix/vm) \\"; \
261 261 echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
262 262 [ -n "$(CFLAGS_BROWSE)" ] && \
263 263 echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
264 264 [ -n "$(ENABLE_FULL_DEBUG_SYMBOLS)" ] && \
265 265 echo && echo "ENABLE_FULL_DEBUG_SYMBOLS = $(ENABLE_FULL_DEBUG_SYMBOLS)"; \
266 266 [ -n "$(OBJCOPY)" ] && \
267 267 echo && echo "OBJCOPY = $(OBJCOPY)"; \
268 268 [ -n "$(STRIP_POLICY)" ] && \
269 269 echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
270 270 [ -n "$(ZIP_DEBUGINFO_FILES)" ] && \
271 271 echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \
272 272 [ -n "$(ZIPEXE)" ] && \
273 273 echo && echo "ZIPEXE = $(ZIPEXE)"; \
274 274 [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
275 275 echo && \
276 276 echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
277 277 echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
278 278 echo; \
279 279 [ -n "$(SPEC)" ] && \
280 280 echo "include $(SPEC)"; \
281 281 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
282 282 echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
283 283 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
284 284 ) > $@
285 285
286 286 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
287 287 @echo Creating $@ ...
288 288 $(QUIETLY) ( \
289 289 $(BUILDTREE_COMMENT); \
290 290 echo; \
291 291 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
292 292 ) > $@
293 293
294 294 ../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
295 295 @echo Creating directory list $@
296 296 $(QUIETLY) if [ -d $(HS_ALT_SRC)/share/vm ]; then \
297 297 find $(HS_ALT_SRC)/share/vm/* -prune \
298 298 -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
299 299 \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@; \
300 300 fi;
301 301 $(QUIETLY) find $(HS_COMMON_SRC)/share/vm/* -prune \
302 302 -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
303 303 \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; >> $@
304 304
305 305 Makefile: $(BUILDTREE_MAKE)
306 306 @echo Creating $@ ...
307 307 $(QUIETLY) ( \
308 308 $(BUILDTREE_COMMENT); \
309 309 echo; \
310 310 echo include flags.make; \
311 311 echo; \
312 312 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/top.make"; \
313 313 ) > $@
314 314
315 315 vm.make: $(BUILDTREE_MAKE)
316 316 @echo Creating $@ ...
317 317 $(QUIETLY) ( \
318 318 $(BUILDTREE_COMMENT); \
319 319 echo; \
320 320 echo include flags.make; \
321 321 echo include flags_vm.make; \
322 322 echo; \
323 323 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
324 324 ) > $@
325 325
326 326 adlc.make: $(BUILDTREE_MAKE)
327 327 @echo Creating $@ ...
328 328 $(QUIETLY) ( \
329 329 $(BUILDTREE_COMMENT); \
330 330 echo; \
331 331 echo include flags.make; \
332 332 echo; \
333 333 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
334 334 ) > $@
335 335
336 336 jvmti.make: $(BUILDTREE_MAKE)
337 337 @echo Creating $@ ...
338 338 $(QUIETLY) ( \
339 339 $(BUILDTREE_COMMENT); \
340 340 echo; \
341 341 echo include flags.make; \
342 342 echo; \
343 343 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
344 344 ) > $@
345 345
346 346 trace.make: $(BUILDTREE_MAKE)
347 347 @echo Creating $@ ...
348 348 $(QUIETLY) ( \
349 349 $(BUILDTREE_COMMENT); \
350 350 echo; \
351 351 echo include flags.make; \
352 352 echo; \
353 353 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
354 354 ) > $@
355 355
356 356 sa.make: $(BUILDTREE_MAKE)
357 357 @echo Creating $@ ...
358 358 $(QUIETLY) ( \
359 359 $(BUILDTREE_COMMENT); \
360 360 echo; \
361 361 echo include flags.make; \
362 362 echo; \
363 363 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
364 364 ) > $@
365 365
366 366 dtrace.make: $(BUILDTREE_MAKE)
367 367 @echo Creating $@ ...
368 368 $(QUIETLY) ( \
369 369 $(BUILDTREE_COMMENT); \
370 370 echo; \
371 371 echo include flags.make; \
372 372 echo; \
373 373 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
374 374 ) > $@
375 375
376 376 FORCE:
377 377
378 378 .PHONY: all FORCE
↓ open down ↓ |
329 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX