jdk-sandbox: make/CompileJavaModules.gmk@92fd0e04e0e1 (annotated)

25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	1	#
43395 f8ff08c45b49 8152206: Simplify jvmstat modules gtriantafill parents: 42859 diff changeset	2	# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	4	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	5	# This code is free software; you can redistribute it and/or modify it
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	6	# under the terms of the GNU General Public License version 2 only, as
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	7	# published by the Free Software Foundation. Oracle designates this
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	8	# particular file as subject to the "Classpath" exception as provided
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	9	# by Oracle in the LICENSE file that accompanied this code.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	10	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	11	# This code is distributed in the hope that it will be useful, but WITHOUT
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	12	# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	13	# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	14	# version 2 for more details (a copy is included in the LICENSE file that
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	15	# accompanied this code).
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	16	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	17	# You should have received a copy of the GNU General Public License version
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	18	# 2 along with this work; if not, write to the Free Software Foundation,
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	19	# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	20	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	21	# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	22	# or visit www.oracle.com if you need additional information or have any
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	23	# questions.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	24	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	25
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	26	# This must be the first rule
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	27	default: all
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	28
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	29	include $(SPEC)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	30	include MakeBase.gmk
26116 f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration erikj parents: 26115 diff changeset	31	include Modules.gmk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	32	include JavaCompilation.gmk
26115 7a9dc384f3c8 8055188: General cleanup of minor issues from source restructure erikj parents: 25854 diff changeset	33	include SetupJavaCompilers.gmk
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	34
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	35	# Hook to include the corresponding custom file, if present.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	36	$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk))
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	37
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	38	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	39	# Module specific build settings
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	40
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	41	java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	42
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	43	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	44
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	45	java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.' -XDstringConcat=inline
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	46	java.base_COPY += .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	47	java.base_CLEAN += intrinsic.properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	48
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	49	java.base_EXCLUDE_FILES += \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	50	$(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	51
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	52	java.base_EXCLUDES += java/lang/doc-files
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	53
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	54	# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	55	# data files and shouldn't go in the product
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	56	java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	57
34108 671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	58	ifneq ($(filter solaris macosx linux windows,$(OPENJDK_TARGET_OS)), )
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	59	java.base_EXCLUDE_FILES += \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	60	sun/nio/ch/AbstractPollSelectorImpl.java \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	61	sun/nio/ch/PollSelectorImpl.java \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	62	sun/nio/ch/PollSelectorProvider.java \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	63	#
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	64	endif
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 robm parents: 34102 diff changeset	65
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	66	ifneq ($(OPENJDK_TARGET_OS), solaris)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	67	java.base_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	68	SolarisLoginModule.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	69	SolarisSystem.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	70	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	71	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	72
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	73	ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	74	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	75	# only solaris, macosx and aix
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	76	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	77	java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	78	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	79
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	80	ifeq ($(OPENJDK_TARGET_OS), windows)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	81	java.base_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	82	sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	83	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	84	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	85
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	86	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	87
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	88	java.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
29437 807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo darcy parents: 29313 diff changeset	89
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo darcy parents: 29313 diff changeset	90	################################################################################
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo darcy parents: 29313 diff changeset	91
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	92	java.datatransfer_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	93	java.datatransfer_COPY += flavormap.properties
28903 2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module serb parents: 27602 diff changeset	94
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module serb parents: 27602 diff changeset	95	################################################################################
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module serb parents: 27602 diff changeset	96
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	97	java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference \
45228 b32e004375c1 8180318: Enable HTML 5 checking at compile time ihse parents: 44830 diff changeset	98	'-Xdoclint/package:java.,javax.' -Xlint:exports \
b32e004375c1 8180318: Enable HTML 5 checking at compile time ihse parents: 44830 diff changeset	99	--doclint-format html4
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	100	java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	101	java.desktop_CLEAN += iio-plugin.properties cursors.properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	102
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	103	java.desktop_EXCLUDES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	104	java/awt/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	105	javax/swing/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	106	javax/swing/text/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	107	javax/swing/plaf/synth/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	108	javax/swing/undo/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	109	sun/awt/X11/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	110	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	111
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	112	java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	113	javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	114	javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	115	javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	116	javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	117	javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	118	javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	119	javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	120	sun/awt/resources/security-icon-bw16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	121	sun/awt/resources/security-icon-bw24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	122	sun/awt/resources/security-icon-bw32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	123	sun/awt/resources/security-icon-bw48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	124	sun/awt/resources/security-icon-interim16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	125	sun/awt/resources/security-icon-interim24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	126	sun/awt/resources/security-icon-interim32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	127	sun/awt/resources/security-icon-interim48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	128	sun/awt/resources/security-icon-yellow16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	129	sun/awt/resources/security-icon-yellow24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	130	sun/awt/resources/security-icon-yellow32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	131	sun/awt/resources/security-icon-yellow48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	132	sun/awt/X11/java-icon16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	133	sun/awt/X11/java-icon24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	134	sun/awt/X11/java-icon32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	135	sun/awt/X11/java-icon48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	136	.template \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	137	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	138
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	139	ifeq ($(OPENJDK_TARGET_OS), macosx)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	140	# exclude all X11 on Mac.
29671 2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	141	java.desktop_EXCLUDES += \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	142	sun/awt/X11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	143	sun/java2d/x11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	144	sun/java2d/jules \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	145	sun/java2d/xr \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	146	com/sun/java/swing/plaf/gtk \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	147	#
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	148	java.desktop_EXCLUDE_FILES += \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	149	$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	150	$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	151	$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	152	$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	153	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	154	else
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	155	# TBD: figure out how to eliminate this long list
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	156	java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	157	sun/awt/X11/ScreenFormat.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	158	sun/awt/X11/XArc.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	159	sun/awt/X11/XChar2b.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	160	sun/awt/X11/XCharStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	161	sun/awt/X11/XClassHint.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	162	sun/awt/X11/XComposeStatus.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	163	sun/awt/X11/XExtCodes.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	164	sun/awt/X11/XFontProp.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	165	sun/awt/X11/XFontSetExtents.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	166	sun/awt/X11/XFontStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	167	sun/awt/X11/XGCValues.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	168	sun/awt/X11/XHostAddress.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	169	sun/awt/X11/XIMCallback.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	170	sun/awt/X11/XIMHotKeyTrigger.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	171	sun/awt/X11/XIMHotKeyTriggers.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	172	sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	173	sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	174	sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	175	sun/awt/X11/XIMStatusDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	176	sun/awt/X11/XIMStringConversionCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	177	sun/awt/X11/XIMStringConversionText.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	178	sun/awt/X11/XIMStyles.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	179	sun/awt/X11/XIMText.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	180	sun/awt/X11/XIMValuesList.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	181	sun/awt/X11/XImage.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	182	sun/awt/X11/XKeyboardControl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	183	sun/awt/X11/XKeyboardState.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	184	sun/awt/X11/XOMCharSetList.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	185	sun/awt/X11/XOMFontInfo.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	186	sun/awt/X11/XOMOrientation.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	187	sun/awt/X11/XPoint.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	188	sun/awt/X11/XRectangle.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	189	sun/awt/X11/XSegment.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	190	sun/awt/X11/XStandardColormap.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	191	sun/awt/X11/XTextItem.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	192	sun/awt/X11/XTextItem16.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	193	sun/awt/X11/XTextProperty.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	194	sun/awt/X11/XTimeCoord.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	195	sun/awt/X11/XWindowChanges.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	196	sun/awt/X11/XdbeSwapInfo.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	197	sun/awt/X11/XmbTextItem.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	198	sun/awt/X11/XwcTextItem.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	199	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	200
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	201	ifeq ($(OPENJDK_TARGET_OS), windows)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	202	java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	203	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	204
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	205	ifdef BUILD_HEADLESS_ONLY
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	206	java.desktop_EXCLUDES += sun/applet
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	207	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	208
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	209	# Used on windows and macosx
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	210	ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	211	java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	212	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	213
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	214	# These files do not appear in the build result of the old build. This
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	215	# is because they are generated sources, but the AUTO_JAVA_FILES won't
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	216	# pick them up since they aren't generated when the source dirs are
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	217	# searched and they aren't referenced by any other classes so they won't
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	218	# be picked up by implicit compilation. On a rebuild, they are picked up
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	219	# and compiled. Exclude them here to produce the same rt.jar as the old
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	220	# build does when building just once.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	221	java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	222	javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	223	javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	224	javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	225	javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	226	javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	227	javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	228	javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	229	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	230
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	231	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	232
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	233	java.scripting_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	234	java.scripting_COPY += .js
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	235	java.scripting_CLEAN += .properties
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	236
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	237	################################################################################
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	238
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	239	java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	240
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	241	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	242
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	243	java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	244
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	245	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	246
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	247	java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	248
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	249	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	250
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	251	java.management.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*'
43384 0a0861e1db57 8173607: JMX RMI connector should be in its own module dfuchs parents: 43054 diff changeset	252
0a0861e1db57 8173607: JMX RMI connector should be in its own module dfuchs parents: 43054 diff changeset	253	################################################################################
0a0861e1db57 8173607: JMX RMI connector should be in its own module dfuchs parents: 43054 diff changeset	254
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	255	java.prefs_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	256
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	257	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	258
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	259	java.transaction_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	260
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	261	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	262
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	263	java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	264	java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	265
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	266	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	267
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	268	java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	269	java.sql.rowset_CLEAN_FILES += $(wildcard \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	270	$(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	271	$(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	272
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	273	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	274
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	275	java.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	276	java.rmi_CLEAN_FILES += $(wildcard \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	277	$(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	278	$(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	279
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	280	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	281
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	282	java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	283
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	284	java.corba_COPY += .prp
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	285	java.corba_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	286
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	287	java.corba_EXCLUDES += \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	288	com/sun/corba/se/PortableActivationIDL \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	289	com/sun/tools/corba/se/logutil \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	290	#
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	291	java.corba_EXCLUDE_FILES += \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	292	com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	293	com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	294	com/sun/org/omg/CORBA/IDLTypeOperations.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	295	com/sun/org/omg/CORBA/IRObjectOperations.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	296	org/omg/PortableInterceptor/UNKNOWN.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	297	com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	298	com/sun/corba/se/impl/presentation/rmi/jndi.properties \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	299	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	300
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	301	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	302
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	303	java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	304	java.xml_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	305
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	306	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	307
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	308	java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	309	java.xml.bind_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	310
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	311	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	312
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	313	java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	314	java.xml.soap_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	315
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	316	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	317
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	318	java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	319	java.xml.ws_COPY += .xml
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	320	java.xml.ws_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	321
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	322	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	323
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	324	java.naming_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.' -Xlint:-exports
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	325	java.naming_CLEAN += jndiprovider.properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	326
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	327	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	328
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	329	java.security.saaj_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	330	java.security.saaj_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	331
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	332	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	333
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	334	java.security.jgss_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	335
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	336	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	337
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	338	java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	339
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	340	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	341
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	342	java.xml.crypto_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	343	java.xml.crypto_COPY += .dtd .xml
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	344	java.xml.crypto_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	345
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	346	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	347
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	348	jdk.charsets_COPY += .dat
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	349
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	350	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	351
41271 7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	352	################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	353
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	354	jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	355	'-Xdoclint/package:-com.sun.tools.,-jdk.internal.,sun.tools.serialver.resources.*' \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	356	-XDstringConcat=inline
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	357	jdk.compiler_CLEAN_FILES += $(wildcard \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	358	$(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	359	sun/tools/serialver/resources))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	360
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	361	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	362
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	363	jdk.hotspot.agent_ADD_JAVAC_FLAGS += $(DISABLE_WARNINGS),-overrides
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	364	jdk.hotspot.agent_COPY += .gif .png sa.js .properties
34116 b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33723 diff changeset	365
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33723 diff changeset	366	################################################################################
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33723 diff changeset	367
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	368	jdk.editpad_COPY += .properties
41870 5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	369
5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	370	################################################################################
5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	371
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	372	jdk.jshell_COPY += .jsh .properties
42859 44601aa03c2d 8172155: jshell tool (make): include built-in startup scripts in image rfield parents: 42534 diff changeset	373
44601aa03c2d 8172155: jshell tool (make): include built-in startup scripts in image rfield parents: 42534 diff changeset	374	################################################################################
44601aa03c2d 8172155: jshell tool (make): include built-in startup scripts in image rfield parents: 42534 diff changeset	375
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	376	jdk.internal.le_COPY += .properties
31512 756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	377
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	378	################################################################################
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	379
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	380	jdk.jcmd_COPY += _options
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	381
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	382	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	383
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	384	jdk.dynalink_CLEAN += .properties
34099 64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	385
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	386	################################################################################
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	387
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	388	jdk.javadoc_COPY += .xml .css .js .png
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	389
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	390	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	391
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	392	jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline
43054 14ae60f2a31c 8172432: jar cleanup/update for module and mrm jar sherman parents: 42859 diff changeset	393
14ae60f2a31c 8172432: jar cleanup/update for module and mrm jar sherman parents: 42859 diff changeset	394	################################################################################
14ae60f2a31c 8172432: jar cleanup/update for module and mrm jar sherman parents: 42859 diff changeset	395
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	396	jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	397	jdk.rmic_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	398
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	399	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	400
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	401	# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	402	SCTP_IMPL_CLASSES = \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	403	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	404	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	405	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	406	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	407	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	408	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	409	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	410	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	411	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	412	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	413	$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	414
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	415	ifeq ($(OPENJDK_TARGET_OS), macosx)
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	416	jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	417	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	418
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	419	ifeq ($(OPENJDK_TARGET_OS),aix)
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	420	jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	421	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	422
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	423	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	424
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	425	jdk.jconsole_COPY += .gif .png
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	426
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	427	jdk.jconsole_CLEAN_FILES += $(wildcard \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	428	$(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	429
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	430	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	431
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	432	jdk.jdeps_COPY += .txt
39610 183537aae357 8160398: (jdeps) Replace a list of JDK 8 internal API for detecting if it's removed in JDK 9 or later mchung parents: 39384 diff changeset	433
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	434	jdk.jdeps_CLEAN_FILES += $(wildcard \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	435	$(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	436	$(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
30742 679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	437
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	438	################################################################################
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	439
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	440	jdk.jdi_EXCLUDES += \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	441	com/sun/tools/example/debug/bdi \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	442	com/sun/tools/example/debug/event \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	443	com/sun/tools/example/debug/gui \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	444	com/sun/jdi/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	445	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	446
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	447	jdk.jdi_EXCLUDE_FILES += jdi-overview.html
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	448
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	449	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	450
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	451	jdk.dev_CLEAN_FILES += $(wildcard \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	452	$(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	453	com/sun/tools/script/shell))
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	454
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	455	jdk.dev_COPY += .js oqlhelp.html .txt
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	456
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	457	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	458
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	459	jdk.internal.jvmstat_COPY += aliasmap
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	460
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	461	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	462
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	463	# -parameters provides method's parameters information in class file,
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	464	# JVMCI compilers make use of that information for various sanity checks.
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	465	# Don't use Indy strings concatenation to have good JVMCI startup performance.
44830 65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	466	# The exports are needed since JVMCI is dynamically exported (see
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	467	# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	468
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	469	jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -Xlint:-exports -XDstringConcat=inline
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	470
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	471	################################################################################
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	472
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	473	jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
44830 65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	474	--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	475	--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	476	--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	477	--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	478	--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	479	--add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	480	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	481	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	482	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	483	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	484	--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	485	--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	486	--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	487	#
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	488
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43397 diff changeset	489	jdk.internal.vm.compiler_EXCLUDES += \
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	490	org.graalvm.compiler.core.match.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	491	org.graalvm.compiler.nodeinfo.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	492	org.graalvm.compiler.options.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	493	org.graalvm.compiler.serviceprovider.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	494	org.graalvm.compiler.replacements.verifier \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	495	org.graalvm.compiler.api.directives.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	496	org.graalvm.compiler.api.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	497	org.graalvm.compiler.asm.aarch64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	498	org.graalvm.compiler.asm.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	499	org.graalvm.compiler.asm.sparc.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	500	org.graalvm.compiler.asm.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	501	org.graalvm.compiler.core.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	502	org.graalvm.compiler.core.sparc.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	503	org.graalvm.compiler.core.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	504	org.graalvm.compiler.debug.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	505	org.graalvm.compiler.graph.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	506	org.graalvm.compiler.hotspot.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	507	org.graalvm.compiler.hotspot.lir.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	508	org.graalvm.compiler.hotspot.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	509	org.graalvm.compiler.jtt \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	510	org.graalvm.compiler.lir.jtt \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	511	org.graalvm.compiler.lir.test \
46199 1044e61f255d 8177046: Update Graal iveresov parents: 43926 diff changeset	512	org.graalvm.compiler.loop.test \
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	513	org.graalvm.compiler.microbenchmarks \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	514	org.graalvm.compiler.nodes.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	515	org.graalvm.compiler.options.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	516	org.graalvm.compiler.phases.common.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	517	org.graalvm.compiler.replacements.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	518	org.graalvm.compiler.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	519	org.graalvm.compiler.virtual.bench \
46245 78ed78bcf35f 8186158: Update Graal iveresov parents: 46231 diff changeset	520	org.graalvm.micro.benchmarks \
46199 1044e61f255d 8177046: Update Graal iveresov parents: 43926 diff changeset	521	org.graalvm.util.test \
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	522	#
41271 7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	523
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	524	################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	525
44830 65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	526	# -parameters provides method's parameters information in class file,
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	527	# JVMCI compilers make use of that information for various sanity checks.
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	528	# Don't use Indy strings concatenation to have good JAOTC startup performance.
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	529	# The exports are needed since JVMCI is dynamically exported (see
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	530	# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	531
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	532	jdk.aot_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
44830 65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	533	--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	534	--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	535	--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	536	--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	537	--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	538	--add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	539	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	540	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	541	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	542	--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	543	--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	544	--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	545	--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler,jdk.aot \
65c7a535e272 8177845: Need a mechanism to load Graal dnsimon parents: 43926 diff changeset	546	#
41271 7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	547
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	548	################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	549
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	550	jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	551	jdk.xml.bind_CLEAN += .properties
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	552	jdk.xml.bind_COPY += .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	553
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	554	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	555
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	556	jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	557	jdk.xml.ws_CLEAN += .properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	558
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	559	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	560
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	561	sun.charsets_COPY += .dat
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	562
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	563	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	564
47064 c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk erikj parents: 46245 diff changeset	565	jdk.localedata_COPY += _dict _th
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	566	# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	567	# data files and shouldn't go in the product
40783 eecdf7525f79 8165605: Thai resources in jdk.localedata cause split package issue with java.base naoto parents: 40611 diff changeset	568	jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	569
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	570	################################################################################
41658 14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	571	# If this is an imported module that has prebuilt classes, only compile
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	572	# module-info.java.
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	573	ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	574	$(MODULE)_INCLUDE_FILES := module-info.java
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	575	endif
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	576
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	577	################################################################################
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	578	# Setup the compilation for the module
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	579	#
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	580	MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	581
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	582	# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	583	# JDK_FILTER at the make command line, only a subset of the JDK java files will
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	584	# be recompiled. If multiple paths are separated by comma, convert that into a
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	585	# space separated list.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	586	JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
38847 57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	587	ifeq ($(JDK_FILTER), )
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	588	FAIL_NO_SRC := true
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	589	else
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	590	# When using JDK_FILTER, most module java compilations will end up finding
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	591	# no source files. Don't let that fail the build.
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	592	FAIL_NO_SRC := false
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	593	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	594
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	595	# Get the complete module source path.
e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	596	MODULESOURCEPATH := $(call GetModuleSrcPath)
31014 a3b1e5a584bd 8054717: SJavac should track changes in the public apis of classpath classes! alundblad parents: 30742 diff changeset	597
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	598	# Add imported modules to the modulepath
e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	599	MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	600
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43397 diff changeset	601	ifeq ($(MODULE), jdk.internal.vm.ci)
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43397 diff changeset	602	## WORKAROUND jdk.internal.vm.ci source structure issue
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	603	JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	604	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	605	$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	606	MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	607	endif
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	608
43925 3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43397 diff changeset	609	ifeq ($(MODULE), jdk.internal.vm.compiler)
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci kvn parents: 43397 diff changeset	610	## WORKAROUND jdk.internal.vm.compiler source structure issue
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	611	VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	612	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	613	$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	614	MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	615	endif
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	616
42532 4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	617	ifeq ($(MODULE), jdk.aot)
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	618	## WORKAROUND jdk.aot source structure issue
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	619	AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	620	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	621	$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
42532 4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	622	MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	623	endif
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	624
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	625	$(eval $(call SetupJavaCompilation, $(MODULE), \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	626	SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	627	MODULE := $(MODULE), \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	628	SRC := $(wildcard $(MODULE_SRC_DIRS)), \
38847 57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	629	INCLUDES := $(JDK_USER_DEFINED_FILTER), \
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	630	FAIL_NO_SRC := $(FAIL_NO_SRC), \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	631	BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	632	HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	633	ADD_JAVAC_FLAGS := \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	634	$($(MODULE)_ADD_JAVAC_FLAGS) \
40241 59abac94e4f2 8136930: Simplify use of module-system options by custom launchers mchung parents: 39610 diff changeset	635	--module-source-path $(MODULESOURCEPATH) \
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers mchung parents: 39610 diff changeset	636	--module-path $(MODULEPATH) \
40611 53ba2f7abd45 8160851: Remove old launcher module-related options mchung parents: 40241 diff changeset	637	--system none, \
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	638	))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	639
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	640	TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	641
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	642	# Declare dependencies between java compilations of different modules.
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	643	# Since the other modules are declared in different invocations of this file,
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	644	# use the macro to find the correct target file to depend on.
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	645	# Only the javac compilation actually depends on other modules so limit
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	646	# dependency declaration to that by using the *_COMPILE_TARGET variable.
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	647	$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	648	$(call SetupJavaCompilationCompileTarget, $d, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	649	$(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	650
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	651	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	652	# Copy zh_HK properties files from zh_TW
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	653
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	654	$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	655	$(install-file)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	656
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	657	CreateHkTargets = \
47217 72e3ae9a25eb 8187444: Forest Consolidation: Make build work erikj parents: 47081 diff changeset	658	$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	659	$(subst /share/classes,, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	660	$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1))))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	661
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	662	ifeq ($(MODULE), java.sql.rowset)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	663	TARGETS += $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	664	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	665
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	666	ifeq ($(MODULE), java.rmi)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	667	TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	668	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	669
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	670	################################################################################
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	671	# If this is an imported module, copy the pre built classes and resources into
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	672	# the modules output dir
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	673
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	674	ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	675	$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	676	$(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
37037 4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed erikj parents: 37030 diff changeset	677	$(call MakeDir, $(@D))
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed erikj parents: 37030 diff changeset	678	# Do not delete marker and build meta data files
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed erikj parents: 37030 diff changeset	679	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	680	$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	681	$(TOUCH) $@
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	682
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	683	TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	684
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	685	# Add this dependency to avoid a race between compiling module-info.java and
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	686	# importing the classes.
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	687	$($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	688	endif
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	689
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	690	################################################################################
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	691
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	692	$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	693
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	694	################################################################################
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	695
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	696	all: $(TARGETS)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	697
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	698	.PHONY: all

author	ihse
	Mon, 25 Sep 2017 10:32:00 +0200
changeset 47253	92fd0e04e0e1
parent 47217	72e3ae9a25eb
child 47314	743814386712
permissions	-rw-r--r--