jdk-sandbox: make/Main.gmk@25cfedf27edc (annotated)

14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	1	#
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	2	# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	4	#
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	5	# This code is free software; you can redistribute it and/or modify it
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	6	# under the terms of the GNU General Public License version 2 only, as
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	7	# published by the Free Software Foundation. Oracle designates this
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	8	# particular file as subject to the "Classpath" exception as provided
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	9	# by Oracle in the LICENSE file that accompanied this code.
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	10	#
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	11	# This code is distributed in the hope that it will be useful, but WITHOUT
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	12	# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	13	# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	14	# version 2 for more details (a copy is included in the LICENSE file that
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	15	# accompanied this code).
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	16	#
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	17	# You should have received a copy of the GNU General Public License version
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	18	# 2 along with this work; if not, write to the Free Software Foundation,
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	19	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	20	#
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	21	# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	22	# or visit www.oracle.com if you need additional information or have any
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	23	# questions.
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	24	#
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	25
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	26	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	27	# This is the main makefile containing most actual top level targets. It needs
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	28	# to be called with a SPEC file defined.
29662 78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	29	################################################################################
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	30
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	31	# Declare default target
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	32	default:
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	33
29662 78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	34	ifeq ($(wildcard $(SPEC)),)
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	35	$(error Main.gmk needs SPEC set to a proper spec.gmk)
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	36	endif
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	37
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	38	# Now load the spec
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	39	include $(SPEC)
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	40
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	41	include $(TOPDIR)/make/MainSupport.gmk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	42
20363 fa7663fc5d50 8001931: The new build system whitespace cleanup ihse parents: 20047 diff changeset	43	# Load the vital tools for all the makefiles.
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	44	include $(TOPDIR)/make/common/MakeBase.gmk
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	45	include $(TOPDIR)/make/common/Modules.gmk
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	46	include $(TOPDIR)/make/common/FindTests.gmk
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	47
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	48	# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	49	# valid top level targets. It's used to declare them all as PHONY and to
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	50	# generate the -only targets.
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	51	ALL_TARGETS :=
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	52
22714 a752920c4317 8034191: Move relevant parts of build system to new closed repo ihse parents: 22031 diff changeset	53	# Hook to include the corresponding custom file, if present.
47314 743814386712 8188814: Simplify IncludeCustomExtension ihse parents: 47253 diff changeset	54	$(eval $(call IncludeCustomExtension, Main.gmk))
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	55
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	56	# All modules for the current target platform.
34116 b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33722 diff changeset	57	ALL_MODULES := $(call FindAllModules)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	58
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	59	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	60	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	61	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	62	# Recipes for all targets. Only recipes, dependencies are declared later.
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	63	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	64	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	65
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	66	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	67	# Interim/build tools targets, compiling tools used during the build
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	68
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	69	# When creating a BUILDJDK, the buildtools and interim targets have already
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	70	# been built and should not be built again.
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	71	ifneq ($(CREATING_BUILDJDK), true)
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	72	buildtools-langtools:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	73	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	74
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	75	interim-langtools:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	76	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	77
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	78	interim-rmic:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	79	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	80
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	81	interim-cldrconverter:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	82	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
31948 761ddfee3ef2 8129881: JDK-8008577 breaks Nashorn test naoto parents: 31310 diff changeset	83
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	84	buildtools-jdk:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	85	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	86
407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	87	buildtools-modules:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	88	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	89
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	90	buildtools-hotspot:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	91	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	92	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	93
32806 e0a88439f971 8137088: Drop building of interim_java.corba erikj parents: 32562 diff changeset	94	ALL_TARGETS += buildtools-langtools interim-langtools \
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	95	interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	96	buildtools-hotspot
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	97
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	98	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	99	# Special targets for certain modules
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	100
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	101	unpack-sec:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	102	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	103
33562 c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	104	generate-exported-symbols:
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	105	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	106
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	107	ALL_TARGETS += unpack-sec generate-exported-symbols
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	108
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	109	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	110	# Gensrc targets, generating source before java compilation can be done
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	111	#
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	112	# When creating a BUILDJDK, the java targets have already been built and copied
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	113	# into the buildjdk so no need to generate sources.
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	114	ifneq ($(CREATING_BUILDJDK), true)
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	115	$(eval $(call DeclareRecipesForPhase, GENSRC, \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	116	TARGET_SUFFIX := gensrc-src, \
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	117	FILE_PREFIX := Gensrc, \
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	118	MAKE_SUBDIR := gensrc, \
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	119	CHECK_MODULES := $(ALL_MODULES), \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	120	))
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	121
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	122	$(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	123
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	124	LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
47364 6b3389375f31 8189094: Change required boot jdk to JDK 9 erikj parents: 47314 diff changeset	125	INTERIM_LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, \
6b3389375f31 8189094: Change required boot jdk to JDK 9 erikj parents: 47314 diff changeset	126	$(INTERIM_LANGTOOLS_BASE_MODULES)), $(GENSRC_TARGETS))
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	127	CORBA_GENSRC_TARGETS := $(filter $(addsuffix -%, $(CORBA_MODULES)), $(GENSRC_TARGETS))
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	128	HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	129	JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	130	$(CORBA_GENSRC_TARGETS) $(HOTSPOT_GENSRC_TARGETS), $(GENSRC_TARGETS))
15053 64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile erikj parents: 14466 diff changeset	131
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	132	GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	133	GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	134	$(GENSRC_MODULEINFO_MODULES))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	135
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	136	GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES)
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	137	GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	138	$(addsuffix -gensrc, $(GENSRC_MODULES)))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	139
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	140	define DeclareModuleInfoRecipe
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	141	$1-gensrc-moduleinfo:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	142	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	143	-f GensrcModuleInfo.gmk MODULE=$1)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	144
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	145	$1-gensrc: $1-gensrc-moduleinfo
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	146	endef
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	147
38844 8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	148	$(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m)))
8af6df8a3613 8159047: Disable redundant build steps when creating buildjdk erikj parents: 38546 diff changeset	149	endif
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	150
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	151	ALL_TARGETS += $(GENSRC_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	152
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	153	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	154	# Generate data targets
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	155	$(eval $(call DeclareRecipesForPhase, GENDATA, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	156	TARGET_SUFFIX := gendata, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	157	FILE_PREFIX := Gendata, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	158	MAKE_SUBDIR := gendata, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	159	CHECK_MODULES := $(ALL_MODULES), \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	160	USE_WRAPPER := true))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	161
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	162	ALL_TARGETS += $(GENDATA_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	163
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	164	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	165	# Copy files targets
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	166	$(eval $(call DeclareRecipesForPhase, COPY, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	167	TARGET_SUFFIX := copy, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	168	FILE_PREFIX := Copy, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	169	MAKE_SUBDIR := copy, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	170	CHECK_MODULES := $(ALL_MODULES), \
33045 00f484891bcf 8136421: JEP 243: Java-Level JVM Compiler Interface twisti parents: 32806 diff changeset	171	USE_WRAPPER := true, \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	172	))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	173
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	174	ALL_COPY_MODULES += $(COPY_MODULES)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	175	ALL_COPY_TARGETS += $(COPY_TARGETS)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	176
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	177	IMPORT_COPY_MODULES := $(call FindImportedModules)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	178	IMPORT_COPY_TARGETS := $(addsuffix -copy, $(IMPORT_COPY_MODULES))
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	179	ALL_COPY_MODULES += $(IMPORT_COPY_MODULES)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	180	ALL_COPY_TARGETS += $(IMPORT_COPY_TARGETS)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	181
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	182	define DeclareImportCopyRecipe
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	183	$1-copy:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	184	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	185	-f CopyImportModules.gmk MODULE=$1)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	186	endef
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	187
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	188	$(foreach m, $(IMPORT_COPY_MODULES), $(eval $(call DeclareImportCopyRecipe,$m)))
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	189
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	190	ALL_TARGETS += $(ALL_COPY_TARGETS)
15395 e5d837c6e999 8007093: build-infra: Make should fail if spec is older than configure files erikj parents: 15060 diff changeset	191
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	192	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	193	# Targets for compiling all java modules. Nashorn is treated separately.
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	194	JAVA_MODULES := $(ALL_MODULES)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	195	JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	196
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	197	define DeclareCompileJavaRecipe
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	198	$1-java:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	199	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 33722 diff changeset	200	-f CompileJavaModules.gmk MODULE=$1)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	201	endef
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	202
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	203	$(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	204	$(eval $(call DeclareCompileJavaRecipe,$m)))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	205
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	206	# Build nashorn. Needs to be compiled separately from the rest of the modules
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	207	# due to nasgen.
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	208	jdk.scripting.nashorn-java:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	209	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 33722 diff changeset	210	-f BuildNashorn.gmk compile)
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	211
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	212	ALL_TARGETS += $(JAVA_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	213
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	214	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	215	# Targets for running rmic.
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	216	$(eval $(call DeclareRecipesForPhase, RMIC, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	217	TARGET_SUFFIX := rmic, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	218	FILE_PREFIX := Rmic, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	219	MAKE_SUBDIR := rmic, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	220	CHECK_MODULES := $(ALL_MODULES)))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	221
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	222	ALL_TARGETS += $(RMIC_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	223
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	224	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	225	# Targets for compiling native libraries
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	226	$(eval $(call DeclareRecipesForPhase, LIBS, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	227	TARGET_SUFFIX := libs, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	228	FILE_PREFIX := Lib, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	229	MAKE_SUBDIR := lib, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	230	CHECK_MODULES := $(ALL_MODULES), \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	231	USE_WRAPPER := true))
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	232
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	233	ALL_TARGETS += $(LIBS_TARGETS)
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	234
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	235	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	236	# Targets for compiling native executables
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	237	$(eval $(call DeclareRecipesForPhase, LAUNCHER, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	238	TARGET_SUFFIX := launchers, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	239	FILE_PREFIX := Launcher, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	240	MAKE_SUBDIR := launcher, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	241	CHECK_MODULES := $(ALL_MODULES), \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	242	USE_WRAPPER := true))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	243
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	244	ALL_TARGETS += $(LAUNCHER_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	245
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	246	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	247	# Build hotspot target
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	248
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	249	HOTSPOT_VARIANT_TARGETS := $(addprefix hotspot-, $(JVM_VARIANTS))
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	250	HOTSPOT_VARIANT_GENSRC_TARGETS := $(addsuffix -gensrc, $(HOTSPOT_VARIANT_TARGETS))
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	251	HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	252
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	253	define DeclareHotspotGensrcRecipe
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	254	hotspot-$1-gensrc:
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	255	$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	256	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	257	JVM_VARIANT=$1)
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	258	endef
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	259
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	260	$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	261
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	262	define DeclareHotspotLibsRecipe
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	263	hotspot-$1-libs:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	264	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	265	JVM_VARIANT=$1)
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	266	endef
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	267
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	268	$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	269
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	270	hotspot-jsig:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	271	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	272
37402 62b5f067032e 8152666: The new Hotspot Build System erikj parents: 36506 diff changeset	273	hotspot-ide-project:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	274	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
37402 62b5f067032e 8152666: The new Hotspot Build System erikj parents: 36506 diff changeset	275
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	276	ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	277	$(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
15903 bc0e6cd9d760 8008914: Add nashorn to the tl build jjg parents: 15587 diff changeset	278
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	279	################################################################################
44724 8efb5c82a573 8173801: Modify makefiles to not build demos and samples bundles. shurailine parents: 44397 diff changeset	280	# Build demos targets
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	281
31310 481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	282	demos-jdk:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	283	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	284
45096 6e9ec4d965f2 8179867: JDK9 b167: demos exist in JDK bundles erikj parents: 44733 diff changeset	285	test-image-demos-jdk:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	286	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk images)
45096 6e9ec4d965f2 8179867: JDK9 b167: demos exist in JDK bundles erikj parents: 44733 diff changeset	287
6e9ec4d965f2 8179867: JDK9 b167: demos exist in JDK bundles erikj parents: 44733 diff changeset	288	ALL_TARGETS += demos-jdk test-image-demos-jdk
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	289
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	290	################################################################################
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	291	# Jigsaw specific data and analysis targets.
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	292
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	293	generate-summary:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	294	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	295
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	296	ALL_TARGETS += generate-summary
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	297
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	298	################################################################################
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	299	# Jmod targets
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	300
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	301	JMOD_MODULES := $(ALL_MODULES)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	302	JMOD_TARGETS := $(addsuffix -jmod, $(JMOD_MODULES))
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	303
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	304	define DeclareJmodRecipe
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	305	$1-jmod:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	306	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	307	MODULE=$1)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	308	endef
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	309
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	310	$(foreach m, $(JMOD_MODULES), $(eval $(call DeclareJmodRecipe,$m)))
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	311
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	312	ALL_TARGETS += $(JMOD_TARGETS)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	313
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	314	################################################################################
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	315	# Images targets
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	316
42282 faf3b6722c44 8031567: Better model for storing source revision information ihse parents: 41874 diff changeset	317	store-source-revision:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	318	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk store-source-revision)
39110 712f29ba8708 8136771: Implement the license-swap logic as a make target erikj parents: 38844 diff changeset	319
42282 faf3b6722c44 8031567: Better model for storing source revision information ihse parents: 41874 diff changeset	320	create-source-revision-tracker:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	321	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk create-source-revision-tracker)
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	322
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	323	BOOTCYCLE_TARGET := product-images
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	324	bootcycle-images:
37980 b2d5f366a9ba 8157506: Disable bootcycle build when cross compiling erikj parents: 37975 diff changeset	325	ifneq ($(COMPILE_TYPE), cross)
b2d5f366a9ba 8157506: Disable bootcycle build when cross compiling erikj parents: 37975 diff changeset	326	$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	327	+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
37980 b2d5f366a9ba 8157506: Disable bootcycle build when cross compiling erikj parents: 37975 diff changeset	328	JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
b2d5f366a9ba 8157506: Disable bootcycle build when cross compiling erikj parents: 37975 diff changeset	329	else
b2d5f366a9ba 8157506: Disable bootcycle build when cross compiling erikj parents: 37975 diff changeset	330	$(call LogWarn, Boot cycle build disabled when cross compiling)
b2d5f366a9ba 8157506: Disable bootcycle build when cross compiling erikj parents: 37975 diff changeset	331	endif
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	332
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	333	zip-security:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	334	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	335
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	336	zip-source:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	337	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ZipSource.gmk)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	338
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	339	jrtfs-jar:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	340	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	341
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	342	jdk-image:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	343	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	344
4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	345	jre-image:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	346	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	347
4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	348	symbols-image:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	349	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	350
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	351	profiles-image:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	352	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	353
31310 481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	354	mac-bundles-jdk:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	355	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	356
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	357	release-file:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	358	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	359
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	360	exploded-image-optimize:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	361	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	362
42282 faf3b6722c44 8031567: Better model for storing source revision information ihse parents: 41874 diff changeset	363	ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	364	zip-source jrtfs-jar jdk-image jre-image \
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	365	symbols-image profiles-image mac-bundles-jdk \
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	366	release-file exploded-image-optimize
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	367
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	368	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	369	# Docs targets
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	370
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	371	# If building full docs, to complete docs-*-api we need both the javadoc and
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	372	# modulegraph targets.
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	373	docs-jdk-api-javadoc:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	374	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-javadoc)
44397 f932d6b9f7fe 8173303: Add module-subgraph images to main platform documentation mchung parents: 44078 diff changeset	375
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	376	docs-jdk-api-modulegraph:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	377	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-modulegraph)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	378
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	379	docs-javase-api-javadoc:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	380	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-javadoc)
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	381
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	382	docs-javase-api-modulegraph:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	383	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-modulegraph)
44725 8747b14eb49c 8172312: Update docs target and image for new combined docs ihse parents: 44724 diff changeset	384
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	385	docs-reference-api-javadoc:
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	386	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-reference-api-javadoc)
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	387
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	388	docs-reference-api-modulegraph:
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	389	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-reference-api-modulegraph)
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	390
44733 6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location ihse parents: 44726 diff changeset	391	docs-jdk-specs:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	392	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-specs)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	393
45105 bf3dae998ca2 8180208: Provide a new docs bundle page mchung parents: 45103 diff changeset	394	docs-jdk-index:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	395	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-index)
45105 bf3dae998ca2 8180208: Provide a new docs bundle page mchung parents: 45103 diff changeset	396
41652 a0664e2b49a1 8168772: Convert javadoc generation to build-infra standards ihse parents: 41461 diff changeset	397	docs-zip:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	398	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)
37034 b63fd4af003e 8154313: Generated javadoc scattered all over the place neugens parents: 37031 diff changeset	399
44078 673240c54c2e 8176509: Use pandoc for converting build readme to html ihse parents: 44027 diff changeset	400	update-build-docs:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	401	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
44078 673240c54c2e 8176509: Use pandoc for converting build readme to html ihse parents: 44027 diff changeset	402
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	403	ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	404	docs-javase-api-javadoc docs-javase-api-modulegraph \
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	405	docs-reference-api-javadoc docs-reference-api-modulegraph docs-jdk-specs \
45105 bf3dae998ca2 8180208: Provide a new docs bundle page mchung parents: 45103 diff changeset	406	docs-jdk-index docs-zip update-build-docs
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	407
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	408	################################################################################
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	409	# Cross compilation support
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	410
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	411	ifeq ($(CREATING_BUILDJDK), true)
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	412	# This target is only called by the recursive call below.
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	413	create-buildjdk-interim-image-helper: interim-image jdk.jlink-launchers \
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	414	java.base-copy jdk.jdeps-launchers
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	415	endif
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	416
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	417	create-buildjdk-copy:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	418	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	419
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	420	create-buildjdk-interim-image:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	421	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	422	$@-helper \
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	423	SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	424	HOTSPOT_SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	425	CREATING_BUILDJDK=true)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	426
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	427	ALL_TARGETS += create-buildjdk-copy create-buildjdk-interim-image
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	428
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	429	################################################################################
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	430	# The interim-image is a small jlinked image that is used to generate artifacts
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	431	# at build time for use when linking the real images.
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	432
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	433	INTERIM_JMOD_TARGETS := $(addsuffix -interim-jmod, $(INTERIM_IMAGE_MODULES))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	434
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	435	define DeclareInterimJmodRecipe
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	436	$1-interim-jmod:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	437	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	438	MODULE=$1 \
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	439	JMODS_DIR=$(INTERIM_JMODS_DIR) \
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	440	JMODS_TEMPDIR=$(INTERIM_JMODS_DIR)/temp \
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	441	INTERIM_JMOD=true \
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	442	)
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	443	endef
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	444
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	445	$(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $(call DeclareInterimJmodRecipe,$m)))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	446
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	447	interim-image:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	448	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f InterimImage.gmk)
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	449
38546 91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	450	ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	451	generate-link-opt-data:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	452	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateLinkOptData.gmk)
38546 91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	453	endif
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	454
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	455	ALL_TARGETS += $(INTERIM_JMOD_TARGETS) interim-image generate-link-opt-data
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	456
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	457	################################################################################
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	458	# Generate test names for all JTReg test groups
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	459	#
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	460
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	461	define DeclareRunTestRecipe
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	462	run-test-$1:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	463	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	464
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	465	exploded-run-test-$1:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	466	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	467	TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	468
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	469	endef
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	470
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	471	# ALL_NAMED_TESTS is defined in FindTests.gmk
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	472	$(foreach t, $(ALL_NAMED_TESTS), $(eval $(call DeclareRunTestRecipe,$t)))
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	473	ALL_TEST_TARGETS := $(addprefix run-test-, $(ALL_NAMED_TESTS))
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	474	ALL_EXPLODED_TEST_TARGETS := $(addprefix exploded-run-test-, $(ALL_NAMED_TESTS))
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	475
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	476	ALL_TARGETS += $(ALL_TEST_TARGETS) $(ALL_EXPLODED_TEST_TARGETS)
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	477
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	478	################################################################################
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	479	# Build tests
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	480	#
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	481
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	482	prepare-test-image:
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	483	$(MKDIR) -p $(TEST_IMAGE_DIR)
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	484	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	485
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	486	build-test-hotspot-jtreg-native:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	487	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeHotspot.gmk \
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	488	build-test-hotspot-jtreg-native)
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	489
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	490	test-image-hotspot-jtreg-native:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	491	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeHotspot.gmk \
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	492	test-image-hotspot-jtreg-native)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	493
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	494	build-test-jdk-jtreg-native:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	495	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	496	build-test-jdk-jtreg-native)
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	497
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	498	test-image-jdk-jtreg-native:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	499	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	500	test-image-jdk-jtreg-native)
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	501
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	502	run-test:
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	503	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$(TEST)")
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	504
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	505	exploded-run-test:
29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	506	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	507	TEST="$(TEST)" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	508
37967 8dd54c3bf02a 8148244: Finalize and integrate GTest implementation iignatyev parents: 37965 diff changeset	509	ifeq ($(BUILD_GTEST), true)
8dd54c3bf02a 8148244: Finalize and integrate GTest implementation iignatyev parents: 37965 diff changeset	510	test-image-hotspot-gtest:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	511	+($(CD) $(TOPDIR)/make/hotspot/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk)
37967 8dd54c3bf02a 8148244: Finalize and integrate GTest implementation iignatyev parents: 37965 diff changeset	512	endif
8dd54c3bf02a 8148244: Finalize and integrate GTest implementation iignatyev parents: 37965 diff changeset	513
32562 b4ed30cd962e 8136378: Build test libs using properly integrated makefile ihse parents: 31948 diff changeset	514	build-test-lib:
b4ed30cd962e 8136378: Build test libs using properly integrated makefile ihse parents: 31948 diff changeset	515	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
b4ed30cd962e 8136378: Build test libs using properly integrated makefile ihse parents: 31948 diff changeset	516
37035 08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	517	ifeq ($(BUILD_FAILURE_HANDLER), true)
08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	518	# Builds the failure handler jtreg extension
08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	519	build-test-failure-handler:
37031 e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	520	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	521	-f BuildFailureHandler.gmk build)
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	522
37035 08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	523	# Runs the tests for the failure handler jtreg extension
08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	524	test-failure-handler:
37031 e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	525	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	526	-f BuildFailureHandler.gmk test)
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	527
37035 08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	528	# Copies the failure handler jtreg extension into the test image
08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	529	test-image-failure-handler:
37031 e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	530	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	531	-f BuildFailureHandler.gmk images)
37035 08e00f202d7a 8154292: jdk9-dev: All SE builds failed on 2016-04-14 erikj parents: 37034 diff changeset	532	endif
37031 e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	533
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	534	ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	535	test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
37031 e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	536	test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	537	test-failure-handler test-image-failure-handler test-image-hotspot-gtest \
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	538	run-test exploded-run-test
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	539
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	540	################################################################################
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	541	# Run tests
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	542
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	543	# Run tests specified by $(TEST), or the default test set.
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	544	test:
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	545	$(call RunTests, $(TEST), $(JDK_IMAGE_DIR))
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	546
33566 fc0dc6b3c02d 8139271: Add top-level Makefile target to run hotspots jtreg tests ehelin parents: 33565 diff changeset	547	test-hotspot-jtreg:
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	548	$(call RunTests, "hotspot_all", $(JDK_IMAGE_DIR))
33566 fc0dc6b3c02d 8139271: Add top-level Makefile target to run hotspots jtreg tests ehelin parents: 33565 diff changeset	549
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	550	test-hotspot-jtreg-native:
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	551	$(call RunTests, "hotspot_native_sanity", $(JDK_IMAGE_DIR))
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	552
33565 ac22b6bd7ecb 8139256: Add Makefile target to run internal VM tests ehelin parents: 33564 diff changeset	553	test-hotspot-internal:
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	554	$(call RunTests, "hotspot_internal", $(JDK_OUTPUTDIR))
05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	555
05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	556	test-hotspot-gtest:
05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	557	$(call RunTests, "hotspot_gtest", $(JDK_OUTPUTDIR))
33565 ac22b6bd7ecb 8139256: Add Makefile target to run internal VM tests ehelin parents: 33564 diff changeset	558
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	559	test-jdk-jtreg-native:
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	560	$(call RunTests, "jdk_native_sanity", $(JDK_IMAGE_DIR))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	561
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	562	test-make:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	563	($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	564
33566 fc0dc6b3c02d 8139271: Add top-level Makefile target to run hotspots jtreg tests ehelin parents: 33565 diff changeset	565	ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	566	test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	567
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	568	################################################################################
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	569	# Bundles
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	570
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	571	product-bundles:
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	572	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk product-bundles)
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	573
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	574	profiles-bundles:
bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	575	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk profiles-bundles)
bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	576
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	577	test-bundles:
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	578	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk test-bundles)
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	579
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	580	docs-bundles:
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	581	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles)
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	582
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	583	ALL_TARGETS += product-bundles profiles-bundles test-bundles docs-bundles
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	584
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	585	################################################################################
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	586	# Install targets
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	587
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	588	install:
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	589	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	590
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	591	ALL_TARGETS += install
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	592
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	593	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	594	#
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	595	# Dependency declarations between targets.
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	596	#
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	597	# These are declared in two groups. First all dependencies between targets that
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	598	# have recipes above as these dependencies may be disabled. Then the aggregator
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	599	# targets that do not have recipes of their own, which will never have their
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	600	# dependencies disabled.
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	601	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	602	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	603	# Targets with recipes above
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	604
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	605	# If running an *-only target, parallel execution and dependencies between
cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	606	# recipe targets are disabled. This makes it possible to run a select set of
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	607	# recipe targets in order. It's the responsibility of the user to make sure
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	608	# all prerequisites are fulfilled.
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	609	ifneq ($(findstring -only, $(MAKECMDGOALS)), )
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	610	.NOTPARALLEL:
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	611	else
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	612	$(LANGTOOLS_GENSRC_TARGETS): buildtools-langtools
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	613
47364 6b3389375f31 8189094: Change required boot jdk to JDK 9 erikj parents: 47314 diff changeset	614	interim-langtools: $(INTERIM_LANGTOOLS_GENSRC_TARGETS)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	615
31948 761ddfee3ef2 8129881: JDK-8008577 breaks Nashorn test naoto parents: 31310 diff changeset	616	buildtools-jdk: interim-langtools interim-cldrconverter
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	617
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	618	buildtools-hotspot: interim-langtools
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	619
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	620	buildtools-modules: exploded-image-base
407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	621
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	622	$(CORBA_GENSRC_TARGETS): interim-langtools
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	623
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	624	$(HOTSPOT_GENSRC_TARGETS): interim-langtools buildtools-hotspot
33045 00f484891bcf 8136421: JEP 243: Java-Level JVM Compiler Interface twisti parents: 32806 diff changeset	625
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	626	$(JDK_GENSRC_TARGETS): interim-langtools buildtools-jdk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	627
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	628	$(GENSRC_MODULEINFO_TARGETS): buildtools-jdk
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	629
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	630	$(GENDATA_TARGETS): interim-langtools buildtools-jdk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	631
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	632	interim-rmic: interim-langtools
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	633
32806 e0a88439f971 8137088: Drop building of interim_java.corba erikj parents: 32562 diff changeset	634	$(RMIC_TARGETS): interim-langtools interim-rmic
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	635
31310 481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	636	$(JAVA_TARGETS): interim-langtools
481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	637
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	638	# Declare dependencies between hotspot-<variant>* targets
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	639	$(foreach v, $(JVM_VARIANTS), \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	640	$(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	641	$(eval hotspot-$v-libs: hotspot-$v-gensrc) \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	642	)
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	643
37402 62b5f067032e 8152666: The new Hotspot Build System erikj parents: 36506 diff changeset	644	hotspot-ide-project: hotspot exploded-image
62b5f067032e 8152666: The new Hotspot Build System erikj parents: 36506 diff changeset	645
33562 c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	646	generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	647
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	648	# Building one JVM variant is enough to start building the other libs
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	649	$(LIBS_TARGETS): hotspot-$(JVM_VARIANT_MAIN)-libs
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	650
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	651	$(LAUNCHER_TARGETS): java.base-libs
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	652
33562 c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	653	ifeq ($(STATIC_BUILD), true)
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	654	$(LAUNCHER_TARGETS): generate-exported-symbols
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	655	endif
c76b2fa11486 8136556: Add the ability to perform static builds of MacOSX x64 binaries bobv parents: 32806 diff changeset	656
26115 7a9dc384f3c8 8055188: General cleanup of minor issues from source restructure erikj parents: 25883 diff changeset	657	# The demos are currently linking to libjvm and libjava, just like all other
7a9dc384f3c8 8055188: General cleanup of minor issues from source restructure erikj parents: 25883 diff changeset	658	# jdk libs, even though they don't need to. To avoid warnings, make sure they
7a9dc384f3c8 8055188: General cleanup of minor issues from source restructure erikj parents: 25883 diff changeset	659	# aren't built until after libjava and libjvm are available to link to.
41461 53935ea8789d 8167488: Race condition in build with new exploded-image-optimize target erikj parents: 41458 diff changeset	660	demos-jdk: java.base-libs exploded-image-optimize
45096 6e9ec4d965f2 8179867: JDK9 b167: demos exist in JDK bundles erikj parents: 44733 diff changeset	661	test-image-demos-jdk: demos-jdk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	662
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	663	# Declare dependency from <module>-java to <module>-gensrc
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	664	$(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	665
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	666	# Declare dependencies between java modules
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	667	$(foreach m, $(JAVA_MODULES), \
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	668	$(eval $m-java: $(addsuffix -java, $(filter $(JAVA_MODULES), \
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	669	$(call FindDepsForModule,$m)))))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	670
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	671	# Declare dependencies between <module>-rmic to <module>-java
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	672	$(foreach m, $(RMIC_MODULES), $(eval $m-rmic: $m-java))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	673
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	674	# Declare dependencies from <module>-lib to <module>-java
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	675	# Skip modules that do not have java source.
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	676	# When creating a BUILDJDK, the java compilation has already been done by the
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	677	# normal build and copied in.
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	678	ifneq ($(CREATING_BUILDJDK), true)
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	679	$(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	680	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	681
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	682	# Declare dependencies from all other <module>-lib to java.base-lib
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	683	$(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	684	$(eval $t: java.base-libs))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	685
29851 81a61a04e2fe 8076182: Open Source Java Access Bridge - Create Patch for JEP C127 8055831 ptbrunet parents: 29305 diff changeset	686	# jdk.accessibility depends on java.desktop
81a61a04e2fe 8076182: Open Source Java Access Bridge - Create Patch for JEP C127 8055831 ptbrunet parents: 29305 diff changeset	687	jdk.accessibility-libs: java.desktop-libs
81a61a04e2fe 8076182: Open Source Java Access Bridge - Create Patch for JEP C127 8055831 ptbrunet parents: 29305 diff changeset	688
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	689	# This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	690	# header file used by jdk.jdwp.agent-libs. The jdk.jdwp.agent-gensrc is a
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	691	# virtual target.
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	692	jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	693
26672 528d9d6614e5 8047933: Race between jdk/make/scripts/genExceptions.sh and com.sun.tools.javadoc.Main erikj parents: 26398 diff changeset	694	# The swing beans need to have java base properly generated to avoid errors
528d9d6614e5 8047933: Race between jdk/make/scripts/genExceptions.sh and com.sun.tools.javadoc.Main erikj parents: 26398 diff changeset	695	# in javadoc.
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	696	java.desktop-gensrc-src: java.base-gensrc
26672 528d9d6614e5 8047933: Race between jdk/make/scripts/genExceptions.sh and com.sun.tools.javadoc.Main erikj parents: 26398 diff changeset	697
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43655 diff changeset	698	# The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43655 diff changeset	699	# needs classes from the current JDK.
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	700	jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43655 diff changeset	701	$(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	702	jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43655 diff changeset	703	$(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	704
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43655 diff changeset	705	# For jdk.internal.vm.compiler, the gensrc step is generating a module-info.java.extra
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	706	# file to be processed by the gensrc-moduleinfo target.
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	707	jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	708
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	709	# Explicitly add dependencies for special targets
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	710	java.base-java: unpack-sec
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	711
30742 679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 29854 diff changeset	712	jdk.jdeps-gendata: java rmic
26132 11df1233e1e8 8055856: checkdeps build target doesn't work for cross-compilation builds mchung parents: 26128 diff changeset	713
45873 94940d8e375b 8181298: Assertion failure in com.sun.tools.javac.comp.Modules jlahoda parents: 45555 diff changeset	714	# The ct.sym generation uses all the moduleinfos as input
94940d8e375b 8181298: Assertion failure in com.sun.tools.javac.comp.Modules jlahoda parents: 45555 diff changeset	715	jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)
94940d8e375b 8181298: Assertion failure in com.sun.tools.javac.comp.Modules jlahoda parents: 45555 diff changeset	716
42285 864475e2cf63 8169816: Move src.zip and jrt-fs.jar under the lib directory mchung parents: 42282 diff changeset	717	# Declare dependencies between jmod targets.
864475e2cf63 8169816: Move src.zip and jrt-fs.jar under the lib directory mchung parents: 42282 diff changeset	718	# java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	719	# When creating a BUILDJDK, we don't need to add hashes to java.base, thus
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	720	# we don't need to depend on all other jmods
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	721	ifneq ($(CREATING_BUILDJDK), true)
43655 5aab808cefb5 8174172: Race when building java.base.jmod erikj parents: 43170 diff changeset	722	java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	723	endif
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	724
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	725	# Building java.base-jmod requires all of hotspot to be built.
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	726	java.base-jmod: hotspot
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	727
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	728	# Declare dependencies from <module>-jmod to all other module targets
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	729	# When creating a BUILDJDK, the java compilation has already been done by the
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	730	# normal build and copied in.
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	731	ifneq ($(CREATING_BUILDJDK), true)
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	732	$(foreach m, $(JAVA_MODULES), $(eval $m_JMOD_DEPS += $m-java))
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	733	endif
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	734	$(foreach m, $(GENDATA_MODULES), $(eval $m_JMOD_DEPS += $m-gendata))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	735	$(foreach m, $(RMIC_MODULES), $(eval $m_JMOD_DEPS += $m-rmic))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	736	$(foreach m, $(LIBS_MODULES), $(eval $m_JMOD_DEPS += $m-libs))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	737	$(foreach m, $(LAUNCHER_MODULES), $(eval $m_JMOD_DEPS += $m-launchers))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	738	$(foreach m, $(COPY_MODULES), $(eval $m_JMOD_DEPS += $m-copy))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	739	$(foreach m, $(ALL_MODULES), $(eval $m-jmod: $($(m)_JMOD_DEPS)))
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	740	$(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $m-interim-jmod: $($(m)_JMOD_DEPS)))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	741
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	742	# Jmods cannot be created until we have the jmod tool ready to run. During
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	743	# a normal build we run it from the exploded image, but when cross compiling
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	744	# it's run from the buildjdk, which is either created at build time or user
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	745	# supplied.
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	746	#
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	747	# For the exploded image to be runnable, all java modules and
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	748	# jdk.jlink-launchers need to be built. We also need to copy jvm.cfg (done
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	749	# in java.base-copy) and tzdb.dat (done in java.base-gendata) to the
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	750	# appropriate location otherwise jimage, jlink and jmod won't start. This
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	751	# also applies when creating the buildjdk.
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	752	DEFAULT_JMOD_DEPS := java.base-libs java.base-copy java.base-gendata \
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	753	jdk.jlink-launchers
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	754	# When cross compiling and buildjdk is to be created, depend on creating the
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	755	# buildjdk instead of the default dependencies.
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	756	ifeq ($(CREATE_BUILDJDK), true)
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	757	# Avoid calling create-buildjdk from within a create-buildjdk call.
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	758	ifneq ($(CREATING_BUILDJDK), true)
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	759	$(JMOD_TARGETS): create-buildjdk
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	760	buildtools-modules: create-buildjdk
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	761	else
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	762	# While actually creating the buildjdk, the default deps applies.
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	763	$(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): $(DEFAULT_JMOD_DEPS)
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	764	endif
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	765	else
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	766	# The normal non cross compilation case uses the default deps.
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	767	# To avoid races with the optimize target, that also needs to happen first.
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	768	$(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): $(DEFAULT_JMOD_DEPS) \
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	769	exploded-image-optimize
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	770	endif
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	771
42505 11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image mchung parents: 42292 diff changeset	772	# All modules include the main license files from java.base.
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image mchung parents: 42292 diff changeset	773	$(JMOD_TARGETS): java.base-copy
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image mchung parents: 42292 diff changeset	774
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	775	zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	776	$(filter jdk.crypto%, $(JAVA_TARGETS))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	777
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	778	zip-source: gensrc rmic
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	779
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	780	jrtfs-jar: interim-langtools
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	781
38546 91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	782	ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	783	ifeq ($(CREATE_BUILDJDK), true)
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	784	# If creating a buildjdk, the interim image needs to be based on that.
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	785	generate-link-opt-data: create-buildjdk
38546 91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	786	else ifeq ($(EXTERNAL_BUILDJDK), false)
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	787	# If an external buildjdk has been provided, we skip generating an
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	788	# interim-image and just use the external buildjdk for generating
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	789	# classlist.
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	790	generate-link-opt-data: interim-image
38546 91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	791	endif
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	792	generate-link-opt-data: buildtools-jdk
38546 91a5c3430d4f 8157336: Generation of classlists at build time should be configurable erikj parents: 37980 diff changeset	793
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	794	# The generated classlist needs to go into java.base-jmod.
43783 35fe9d6f5075 8175026: Capture build-time parameters to --generate-jli-classes redestad parents: 43655 diff changeset	795	java.base-jmod jdk.jlink-jmod jdk-image jre-image: generate-link-opt-data
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	796	endif
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	797
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	798	release-file: create-source-revision-tracker
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	799
44724 8efb5c82a573 8173801: Modify makefiles to not build demos and samples bundles. shurailine parents: 44397 diff changeset	800	jdk-image: jmods zip-source demos release-file
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	801	jre-image: jmods release-file
42506 54b0b4fffab5 8170878: JDK 9 fails to build when enabling Hotspot code coverage erikj parents: 42505 diff changeset	802	symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	803
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	804	profiles-image: jmods release-file
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	805
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	806	mac-bundles-jdk: jdk-image jre-image
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	807
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	808	# The optimize target can run as soon as the modules dir has been completely
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	809	# populated (java, copy and gendata targets) and the basic libs and launchers
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	810	# have been built.
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	811	exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	812	buildtools-modules
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	813
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	814	bootcycle-images: jdk-image
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	815
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	816	docs-jdk-api-javadoc: $(GENSRC_TARGETS) rmic
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	817
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	818	docs-javase-api-javadoc: $(GENSRC_TARGETS) rmic
44397 f932d6b9f7fe 8173303: Add module-subgraph images to main platform documentation mchung parents: 44078 diff changeset	819
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	820	docs-reference-api-javadoc: $(GENSRC_TARGETS) rmic
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	821
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	822	docs-jdk-api-modulegraph: exploded-image buildtools-modules
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	823
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	824	docs-javase-api-modulegraph: exploded-image buildtools-modules
44725 8747b14eb49c 8172312: Update docs target and image for new combined docs ihse parents: 44724 diff changeset	825
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	826	docs-reference-api-modulegraph: exploded-image buildtools-modules
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	827
44733 6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location ihse parents: 44726 diff changeset	828	# The gensrc steps for hotspot and jdk.jdi create html spec files.
45229 88a3fab6006f 8180426: Use standard css file for new docs bundle index.html page ihse parents: 45105 diff changeset	829	docs-jdk-specs: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc \
88a3fab6006f 8180426: Use standard css file for new docs bundle index.html page ihse parents: 45105 diff changeset	830	docs-jdk-index
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	831
45105 bf3dae998ca2 8180208: Provide a new docs bundle page mchung parents: 45103 diff changeset	832	docs-jdk-index: exploded-image buildtools-modules
bf3dae998ca2 8180208: Provide a new docs bundle page mchung parents: 45103 diff changeset	833
44733 6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location ihse parents: 44726 diff changeset	834	docs-zip: docs-jdk
37649 3809534d4531 8154841: Let different Jib profiles have different default make targets erikj parents: 37407 diff changeset	835
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	836	test: jdk-image test-image
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	837
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	838	run-test: jdk-image test-image
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	839	exploded-run-test: exploded-image test-image
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	840
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	841	# Declare dependency for all generated test targets
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	842	$(foreach t, $(ALL_TEST_TARGETS), $(eval $t: jdk-image test-image))
45266 29347d0c7122 8180651: Make target to run tests on exploded image erikj parents: 45105 diff changeset	843	$(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image))
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	844
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	845	create-buildjdk-copy: jdk.jlink-java java.base-gendata \
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	846	$(addsuffix -java, $(INTERIM_IMAGE_MODULES))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	847
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	848	create-buildjdk-interim-image: create-buildjdk-copy
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	849
41874 07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod erikj parents: 41660 diff changeset	850	interim-image: $(INTERIM_JMOD_TARGETS)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	851
28600 09dd1740f176 8069261: Create make dependencies on make variable values erikj parents: 28285 diff changeset	852	test-make: clean-test-make
09dd1740f176 8069261: Create make dependencies on make variable values erikj parents: 28285 diff changeset	853
41461 53935ea8789d 8167488: Race condition in build with new exploded-image-optimize target erikj parents: 41458 diff changeset	854	build-test-lib: exploded-image-optimize
33436 c6d79360ecff 8141051: Build test libs -source/-target 9 erikj parents: 33045 diff changeset	855
37031 e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	856	build-test-failure-handler: interim-langtools
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	857
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	858	test-failure-handler: build-test-failure-handler
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	859
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	860	test-image-failure-handler: build-test-failure-handler
e90042bf422d 8149777: Enable enhanced failure handler for "make test" erikj parents: 36789 diff changeset	861
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	862	build-test-hotspot-jtreg-native: buildtools-jdk \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	863	hotspot-$(JVM_VARIANT_MAIN)-libs
29159 7fed45c53518 8074072: Race condition in build since JDK-8072842 can cause failed builds on Solaris erikj parents: 29156 diff changeset	864
45555 9b00774291d5 8181147: JNU_GetStringPlatformChars should have a fast path for UTF-8 redestad parents: 45271 diff changeset	865	build-test-jdk-jtreg-native: buildtools-jdk java.base-libs
29159 7fed45c53518 8074072: Race condition in build since JDK-8072842 can cause failed builds on Solaris erikj parents: 29156 diff changeset	866
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	867	test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	868
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	869	test-image-jdk-jtreg-native: build-test-jdk-jtreg-native
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	870
37967 8dd54c3bf02a 8148244: Finalize and integrate GTest implementation iignatyev parents: 37965 diff changeset	871	test-image-hotspot-gtest: hotspot
8dd54c3bf02a 8148244: Finalize and integrate GTest implementation iignatyev parents: 37965 diff changeset	872
33565 ac22b6bd7ecb 8139256: Add Makefile target to run internal VM tests ehelin parents: 33564 diff changeset	873	test-hotspot-internal: exploded-image
ac22b6bd7ecb 8139256: Add Makefile target to run internal VM tests ehelin parents: 33564 diff changeset	874
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	875	test-hotspot-jtreg: jdk-image test-image
33566 fc0dc6b3c02d 8139271: Add top-level Makefile target to run hotspots jtreg tests ehelin parents: 33565 diff changeset	876
37974 05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	877	test-hotspot-gtest: exploded-image test-image-hotspot-gtest
05e1a65c1d56 8157028: Add make target for running gtest tests ehelin parents: 37972 diff changeset	878
33722 f82c74b7f2db 8143036: Make install target does not depend on images erikj parents: 33571 diff changeset	879	install: product-images
f82c74b7f2db 8143036: Make install target does not depend on images erikj parents: 33571 diff changeset	880
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	881	product-bundles: product-images
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	882
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	883	profiles-bundles: profiles-images
bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	884
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	885	test-bundles: test-image
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	886
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	887	docs-bundles: docs-image
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	888
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	889	generate-summary: jmods buildtools-modules
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	890
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	891	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	892
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	893	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	894	# Virtual targets without recipes
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	895
32806 e0a88439f971 8137088: Drop building of interim_java.corba erikj parents: 32562 diff changeset	896	buildtools: buildtools-langtools interim-langtools interim-rmic \
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42529 diff changeset	897	buildtools-jdk buildtools-hotspot
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	898
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	899	hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	900
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	901	hotspot-libs: hotspot-jsig
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	902
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	903	# Create targets hotspot-libs and hotspot-gensrc.
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	904	$(foreach v, $(JVM_VARIANTS), \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	905	$(eval hotspot-libs: hotspot-$v-libs) \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	906	$(eval hotspot-gensrc: hotspot-$v-gensrc) \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	907	)
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	908
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	909	gensrc: $(GENSRC_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	910
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	911	gendata: $(GENDATA_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	912
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	913	copy: $(ALL_COPY_TARGETS)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	914
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	915	java: $(JAVA_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	916
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	917	rmic: $(RMIC_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	918
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	919	libs: $(LIBS_TARGETS)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	920
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	921	launchers: $(LAUNCHER_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	922
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	923	jmods: $(JMOD_TARGETS)
17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	924
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	925	# Explicitly declare dependency for virtual target jdk.jdwp.agent-gensrc which
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	926	# is actually handled by jdk.jdi-gensrc
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	927	jdk.jdwp.agent-gensrc: jdk.jdi-gensrc
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	928
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	929	# Declare dependencies from <module> to all the individual targets specific
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 33722 diff changeset	930	# to that module <module>-*, that are needed for the exploded image.
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	931	$(foreach m, $(GENSRC_MODULES), $(eval $m: $m-gensrc))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	932	$(foreach m, $(JAVA_MODULES), $(eval $m: $m-java))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	933	$(foreach m, $(GENDATA_MODULES), $(eval $m: $m-gendata))
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	934	$(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic))
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	935	$(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	936	$(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	937	$(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy))
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	938
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	939	# Building java.base includes building all of hotspot.
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	940	java.base: hotspot
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	941
31310 481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	942	demos: demos-jdk
481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	943
47253 92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	944	# The "exploded image" is a locally runnable JDK in $(OUTPUTDIR)/jdk.
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	945	exploded-image-base: $(ALL_MODULES)
42292 11f0a32a38f0 8170528: Race condition with release file creation erikj parents: 42285 diff changeset	946	exploded-image: exploded-image-base release-file
41275 0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	947	# When cross compiling, no need to optimize the exploded image since it won't
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	948	# be runnable on the host platform anyway.
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	949	ifneq ($(COMPILE_TYPE), cross)
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	950	exploded-image: exploded-image-optimize
0ffcfee0d9a9 8167195: VM fails to initialize intermittently when running jmod to create some images erikj parents: 41260 diff changeset	951	endif
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	952
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	953	create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	954
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	955	docs-jdk-api: docs-jdk-api-javadoc
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	956	docs-javase-api: docs-javase-api-javadoc
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	957	docs-reference-api: docs-reference-api-javadoc
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	958
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	959	# If we're building full docs, we must also generate the module graphs to
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	960	# get non-broken api documentation.
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	961	ifeq ($(ENABLE_FULL_DOCS), true)
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	962	docs-jdk-api: docs-jdk-api-modulegraph
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	963	docs-javase-api: docs-javase-api-modulegraph
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	964	docs-reference-api: docs-reference-api-modulegraph
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	965	endif
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	966
45105 bf3dae998ca2 8180208: Provide a new docs bundle page mchung parents: 45103 diff changeset	967	docs-jdk: docs-jdk-api docs-jdk-specs docs-jdk-index
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	968	docs-javase: docs-javase-api
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	969	docs-reference: docs-reference-api
44726 04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	970
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	971	# alias for backwards compatibility
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	972	docs-javadoc: docs-jdk-api
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file ihse parents: 44725 diff changeset	973
31310 481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	974	mac-bundles: mac-bundles-jdk
481585782338 8081814: Modularize the deploy build erikj parents: 30742 diff changeset	975
47253 92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	976	# The $(OUTPUTDIR)/images directory contain the resulting deliverables,
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	977	# and in line with this, our targets for creating these are named *-image[s].
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	978
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	979	# This target builds the product images, e.g. the JRE and JDK image
65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	980	# (and possibly other, more specific versions)
41260 4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	981	product-images: jdk-image jre-image symbols-image exploded-image
4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	982
4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	983	# zip-security is actually a bundle, but for now it needs to be considered
4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	984	# an image until this can be cleaned up properly.
4f71f07b30d1 8150736: Excessive disk space used by build system erikj parents: 41171 diff changeset	985	product-images: zip-security
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	986
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	987	# Declare these for backwards compatiblity and convenience.
bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	988	profiles profiles-images: profiles-image
bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	989
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	990	# The module summary cannot be run when:
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	991	# * Cross compiling and building a partial BUILDJDK for the build host
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	992	# * An external buildjdk has been supplied since it may not match the
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	993	# module selection of the target jdk
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	994	ifneq ($(CREATE_BUILDJDK), true)
37770 9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	995	ifeq ($(EXTERNAL_BUILDJDK), false)
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	996	product-images: generate-summary
9f040cf69078 8150044: Generate classlists at build-time redestad parents: 37765 diff changeset	997	endif
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	998	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	999
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1000	ifeq ($(OPENJDK_TARGET_OS), macosx)
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1001	product-images: mac-bundles
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1002	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1003
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1004	# This target builds the documentation image
44733 6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location ihse parents: 44726 diff changeset	1005	docs-image: docs-jdk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1006
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1007	# This target builds the test image
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	1008	test-image: prepare-test-image test-image-hotspot-jtreg-native \
45096 6e9ec4d965f2 8179867: JDK9 b167: demos exist in JDK bundles erikj parents: 44733 diff changeset	1009	test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest \
6e9ec4d965f2 8179867: JDK9 b167: demos exist in JDK bundles erikj parents: 44733 diff changeset	1010	test-image-demos-jdk
28285 3b8c4ccbb332 8067759: Create initial test bundle framework ihse parents: 28011 diff changeset	1011
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1012	# all-images builds all our deliverables as images.
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1013	all-images: product-images test-image docs-image
65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1014
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1015	# all-bundles packages all our deliverables as tar.gz bundles.
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1016	all-bundles: product-bundles test-bundles docs-bundles
e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1017
42510 406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	1018	ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
406dfb60de57 8170284: Move fine granular hotspot make targets to top level erikj parents: 41874 diff changeset	1019	copy java rmic libs launchers jmods \
44724 8efb5c82a573 8173801: Modify makefiles to not build demos and samples bundles. shurailine parents: 44397 diff changeset	1020	jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
41171 407480ec6872 8166948: Exploded image too slow to be usable erikj parents: 39938 diff changeset	1021	exploded-image-base exploded-image \
47432 28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	1022	create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
28d6070f5f2f 8189056: javadoc target for stable specdiff comparisons ihse parents: 47364 diff changeset	1023	docs-javase docs-reference docs-javadoc mac-bundles product-images \
43043 bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	1024	profiles profiles-images \
bf14e07c9075 8172241: Cleanup mistakes in jib publish support change erikj parents: 42981 diff changeset	1025	docs-image test-image all-images \
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1026	all-bundles
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1027
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1028	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1029
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1030	# Traditional targets typically run by users.
65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1031	# These can be considered aliases for the targets now named by a more
65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1032	# "modern" naming scheme.
34491 307c28cb36c2 8136782: Introduce a build/configure wrapper erikj parents: 34117 diff changeset	1033	default: $(DEFAULT_MAKE_TARGET)
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1034	jdk: exploded-image
65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1035	images: product-images
65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1036	docs: docs-image
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1037	bundles: all-bundles
28811 65cf1b4087cf 8071767: Improve names and dependencies for image targets ihse parents: 28809 diff changeset	1038	all: all-images
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1039
37972 e1fa5c2e62a0 8136777: Introduce bundle targets erikj parents: 37969 diff changeset	1040	ALL_TARGETS += default jdk images docs bundles all
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1041
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1042	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1043	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1044	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1045	# Clean targets
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1046	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1047	################################################################################
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27329 diff changeset	1048	# Clean targets are automatically run serially by the Makefile calling this
26398 ca1f84f97e20 8057537: Serialize reconfigure and fix make clean-foo foo erikj parents: 26285 diff changeset	1049	# file.
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1050
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1051	CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36284 diff changeset	1052	images make-support test-make bundles buildjdk
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1053	CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
33437 1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1054	CLEAN_SUPPORT_DIRS += demos
1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1055	CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
32562 b4ed30cd962e 8136378: Build test libs using properly integrated makefile ihse parents: 31948 diff changeset	1056	CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	1057	CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
41652 a0664e2b49a1 8168772: Convert javadoc generation to build-infra standards ihse parents: 41461 diff changeset	1058	CLEAN_PHASES := gensrc java native include
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1059	CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1060	CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1061	# Construct targets of the form clean-$module-$phase
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1062	CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1063	$(addprefix $m-, $(CLEAN_PHASES))))
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	1064
2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	1065	# Remove everything, except the output from configure.
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1066	clean: $(CLEAN_DIR_TARGETS)
47253 92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	1067	($(CD) $(OUTPUTDIR) && $(RM) -r build.log)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1068	$(ECHO) Cleaned all build artifacts.
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1069
41652 a0664e2b49a1 8168772: Convert javadoc generation to build-infra standards ihse parents: 41461 diff changeset	1070	clean-docs:
a0664e2b49a1 8168772: Convert javadoc generation to build-infra standards ihse parents: 41461 diff changeset	1071	$(call CleanDocs)
a0664e2b49a1 8168772: Convert javadoc generation to build-infra standards ihse parents: 41461 diff changeset	1072
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1073	$(CLEAN_DIR_TARGETS):
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1074	$(call CleanDir,$(patsubst clean-%, %, $@))
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1075
33437 1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1076	$(CLEAN_SUPPORT_DIR_TARGETS):
1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1077	$(call CleanSupportDir,$(patsubst clean-%, %, $@))
1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1078
29156 bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	1079	$(CLEAN_TEST_TARGETS):
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	1080	$(call CleanTest,$(patsubst clean-test-%, %, $@))
bd932374081c 8072842: Add support for building native JTReg tests ihse parents: 28899 diff changeset	1081
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1082	$(CLEAN_PHASE_TARGETS):
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1083	$(call Clean-$(patsubst clean-%,%, $@))
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1084
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1085	$(CLEAN_MODULE_TARGETS):
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1086	$(call CleanModule,$(patsubst clean-%, %, $@))
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1087
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1088	$(CLEAN_MODULE_PHASE_TARGETS):
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1089	$(call Clean-$(word 3, $(subst -,$(SPACE),$@)), \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1090	$(word 2, $(subst -,$(SPACE),$@)))
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1091
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1092	# When removing the support dir, we must also remove jdk. Building classes has
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1093	# the side effect of generating native headers. The headers end up in support
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1094	# while classes and touch files end up in jdk.
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27329 diff changeset	1095	clean-support: clean-jdk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1096
29790 79641c886929 8073634: Improve clean targets erikj parents: 29788 diff changeset	1097	# Remove everything, including configure configuration. If the output
79641c886929 8073634: Improve clean targets erikj parents: 29788 diff changeset	1098	# directory was created by configure and now becomes empty, remove it as well.
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	1099	dist-clean: clean
47253 92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	1100	($(CD) $(OUTPUTDIR) && \
29790 79641c886929 8073634: Improve clean targets erikj parents: 29788 diff changeset	1101	$(RM) -r *spec.gmk $(CONFIGURESUPPORT_OUTPUTDIR) Makefile compare.sh ide)
47253 92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	1102	$(if $(filter $(CONF_NAME),$(notdir $(OUTPUTDIR))), \
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	1103	if test "x`$(LS) $(OUTPUTDIR)`" != x; then \
20363 fa7663fc5d50 8001931: The new build system whitespace cleanup ihse parents: 20047 diff changeset	1104	$(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
fa7663fc5d50 8001931: The new build system whitespace cleanup ihse parents: 20047 diff changeset	1105	else \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	1106	($(CD) $(TOPDIR) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
47253 92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR ihse parents: 47217 diff changeset	1107	&& $(RM) -r $(OUTPUTDIR)) \
20363 fa7663fc5d50 8001931: The new build system whitespace cleanup ihse parents: 20047 diff changeset	1108	fi \
fa7663fc5d50 8001931: The new build system whitespace cleanup ihse parents: 20047 diff changeset	1109	)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1110	$(ECHO) Cleaned everything, you will have to re-run configure.
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1111
41652 a0664e2b49a1 8168772: Convert javadoc generation to build-infra standards ihse parents: 41461 diff changeset	1112	ALL_TARGETS += clean clean-docs dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \
33437 1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1113	$(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \
1cf150337073 8141261: Clean up building of demos ihse parents: 33436 diff changeset	1114	$(CLEAN_MODULE_PHASE_TARGETS)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1115
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1116	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1117	# Declare *-only targets for each normal target
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1118	$(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t)))
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	1119
29662 78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1120	ALL_TARGETS += $(addsuffix -only, $(filter-out dist-clean clean%, $(ALL_TARGETS)))
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1121
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1122	################################################################################
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1123
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1124	# Include JPRT targets
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 45873 diff changeset	1125	include $(TOPDIR)/make/Jprt.gmk
29662 78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1126
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1127	################################################################################
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1128
29788 b581a3d9db41 8076465: New Init.gmk needs improvements ihse parents: 29663 diff changeset	1129	# The following targets are intentionally not added to ALL_TARGETS since they
b581a3d9db41 8076465: New Init.gmk needs improvements ihse parents: 29663 diff changeset	1130	# are internal only, to support Init.gmk.
b581a3d9db41 8076465: New Init.gmk needs improvements ihse parents: 29663 diff changeset	1131
29662 78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1132	print-targets:
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1133	@$(ECHO) $(sort $(ALL_TARGETS))
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1134
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1135	print-modules:
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1136	@$(ECHO) $(sort $(ALL_MODULES))
78c47f0002c3 8076060: Improve make bootstrap process ihse parents: 29305 diff changeset	1137
44027 3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	1138	print-tests:
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	1139	@$(ECHO) $(sort $(ALL_NAMED_TESTS))
3a3050924db2 8176084: Developer-friendly run-test facility ihse parents: 43927 diff changeset	1140
29788 b581a3d9db41 8076465: New Init.gmk needs improvements ihse parents: 29663 diff changeset	1141	create-main-targets-include:
35008 ef0cd710989f 8146403: Windows build can be faster erikj parents: 34491 diff changeset	1142	$(call LogInfo, Generating main target list)
29788 b581a3d9db41 8076465: New Init.gmk needs improvements ihse parents: 29663 diff changeset	1143	@$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \
b581a3d9db41 8076465: New Init.gmk needs improvements ihse parents: 29663 diff changeset	1144	$(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1145
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1146	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1147
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1148	.PHONY: $(ALL_TARGETS)
98ce0879ab4c 8054834: Modular Source Code chegar parents: 22721 diff changeset	1149
14111 2a82ecb35fc7 8000992: Update new build-infra makefiles ohair parents: diff changeset	1150	FRC: # Force target

author	dlong
	Fri, 01 Dec 2017 11:17:45 -0800
changeset 48190	25cfedf27edc
parent 47432	28d6070f5f2f
child 47940	5434db052a08
permissions	-rw-r--r--