jdk-sandbox: make/CompileJavaModules.gmk@4780f4130eb0 (annotated)

25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	1	#
36787 402e5e40f6e5 7179078: Remove @beaninfo processing from the makefiles serb parents: 36506 diff changeset	2	# Copyright (c) 2014, 2016, 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
35366 394a28cc1032 8148483: JEP 280: Indify String Concatenation shade parents: 35024 diff changeset	45	java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.' -XDstringConcat=inline
27240 a2a7d337e3b7 8048124: Read hijra-config-umalqura.properties as a resource rriggs parents: 27137 diff changeset	46	java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	47	java.base_CLEAN := intrinsic.properties
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 += \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	50	$(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
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
29437 807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo darcy parents: 29313 diff changeset	88	java.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
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
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	92	java.datatransfer_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
28903 2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module serb parents: 27602 diff changeset	93	java.datatransfer_COPY := flavormap.properties
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
37399 ab8e0abb7578 8145468: update java.lang APIs with new deprecations smarks parents: 37037 diff changeset	97	java.desktop_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference \
42137 f6e23798622f 8169518: Suppress Deprecation warnings for deprecated Swing APIs prr parents: 41872 diff changeset	98	'-Xdoclint/package:java.,javax.' -Xlint:exports
28903 2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module serb parents: 27602 diff changeset	99	java.desktop_COPY := .gif .png .wav .txt .xml .css .pf
29169 9a91cf20c223 8039269: images/cursors should not be in ${java.home}/lib serb parents: 28903 diff changeset	100	java.desktop_CLEAN := iio-plugin.properties cursors.properties
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	101
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	102	java.desktop_EXCLUDES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	103	java/awt/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	104	javax/swing/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	105	javax/swing/text/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	106	javax/swing/plaf/synth/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	107	javax/swing/undo/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	108	sun/awt/X11/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	109	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	110
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	111	java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	112	javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	113	javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	114	javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	115	javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	116	javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	117	javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	118	javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	119	sun/awt/resources/security-icon-bw16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	120	sun/awt/resources/security-icon-bw24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	121	sun/awt/resources/security-icon-bw32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	122	sun/awt/resources/security-icon-bw48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	123	sun/awt/resources/security-icon-interim16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	124	sun/awt/resources/security-icon-interim24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	125	sun/awt/resources/security-icon-interim32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	126	sun/awt/resources/security-icon-interim48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	127	sun/awt/resources/security-icon-yellow16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	128	sun/awt/resources/security-icon-yellow24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	129	sun/awt/resources/security-icon-yellow32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	130	sun/awt/resources/security-icon-yellow48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	131	sun/awt/X11/java-icon16.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	132	sun/awt/X11/java-icon24.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	133	sun/awt/X11/java-icon32.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	134	sun/awt/X11/java-icon48.png \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	135	.template \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	136	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	137
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	138	ifeq ($(OPENJDK_TARGET_OS), macosx)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	139	# exclude all X11 on Mac.
29671 2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	140	java.desktop_EXCLUDES += \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	141	sun/awt/X11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	142	sun/java2d/x11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	143	sun/java2d/jules \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	144	sun/java2d/xr \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	145	com/sun/java/swing/plaf/gtk \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	146	#
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	147	java.desktop_EXCLUDE_FILES += \
29671 2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	148	$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	149	$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	150	$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX prr parents: 29169 diff changeset	151	$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	152	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	153	else
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	154	# TBD: figure out how to eliminate this long list
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	155	java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	156	sun/awt/X11/ScreenFormat.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	157	sun/awt/X11/XArc.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	158	sun/awt/X11/XChar2b.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	159	sun/awt/X11/XCharStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	160	sun/awt/X11/XClassHint.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	161	sun/awt/X11/XComposeStatus.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	162	sun/awt/X11/XExtCodes.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	163	sun/awt/X11/XFontProp.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	164	sun/awt/X11/XFontSetExtents.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	165	sun/awt/X11/XFontStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	166	sun/awt/X11/XGCValues.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	167	sun/awt/X11/XHostAddress.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	168	sun/awt/X11/XIMCallback.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	169	sun/awt/X11/XIMHotKeyTrigger.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	170	sun/awt/X11/XIMHotKeyTriggers.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	171	sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	172	sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	173	sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	174	sun/awt/X11/XIMStatusDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	175	sun/awt/X11/XIMStringConversionCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	176	sun/awt/X11/XIMStringConversionText.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	177	sun/awt/X11/XIMStyles.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	178	sun/awt/X11/XIMText.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	179	sun/awt/X11/XIMValuesList.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	180	sun/awt/X11/XImage.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	181	sun/awt/X11/XKeyboardControl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	182	sun/awt/X11/XKeyboardState.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	183	sun/awt/X11/XOMCharSetList.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	184	sun/awt/X11/XOMFontInfo.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	185	sun/awt/X11/XOMOrientation.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	186	sun/awt/X11/XPoint.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	187	sun/awt/X11/XRectangle.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	188	sun/awt/X11/XSegment.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	189	sun/awt/X11/XStandardColormap.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	190	sun/awt/X11/XTextItem.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	191	sun/awt/X11/XTextItem16.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	192	sun/awt/X11/XTextProperty.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	193	sun/awt/X11/XTimeCoord.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	194	sun/awt/X11/XWindowChanges.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	195	sun/awt/X11/XdbeSwapInfo.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	196	sun/awt/X11/XmbTextItem.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	197	sun/awt/X11/XwcTextItem.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	198	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	199
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	200	ifeq ($(OPENJDK_TARGET_OS), windows)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	201	java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	202	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	203
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	204	ifdef BUILD_HEADLESS_ONLY
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	205	java.desktop_EXCLUDES += sun/applet
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	206	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	207
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	208	# Used on windows and macosx
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	209	ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	210	java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	211	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	212
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	213	# These files do not appear in the build result of the old build. This
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	214	# is because they are generated sources, but the AUTO_JAVA_FILES won't
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	215	# pick them up since they aren't generated when the source dirs are
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	216	# searched and they aren't referenced by any other classes so they won't
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	217	# be picked up by implicit compilation. On a rebuild, they are picked up
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	218	# and compiled. Exclude them here to produce the same rt.jar as the old
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	219	# build does when building just once.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	220	java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	221	javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	222	javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	223	javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	224	javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	225	javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	226	javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	227	javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	228	#
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
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	232	java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	233	java.scripting_COPY := .js
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	234	java.scripting_CLEAN := .properties
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	235
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	236	################################################################################
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	237
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	238	java.instrument_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	239
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	java.logging_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	243
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	java.management_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	247
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	java.prefs_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	251
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	252	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	253
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	254	java.transaction_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	255
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
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	258	java.sql_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	259	java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	260
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	261	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	262
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	263	java.sql.rowset_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	264	java.sql.rowset_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	265	$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	266	$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	267
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	268	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	269
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	270	java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	271	java.rmi_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	272	$(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	273	$(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	274
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	275	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	276
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	277	java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	278
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	279	java.corba_COPY := .prp
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	280	java.corba_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	281
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	282	java.corba_EXCLUDES += \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	283	com/sun/corba/se/PortableActivationIDL \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	284	com/sun/tools/corba/se/logutil \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	285	#
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	286	java.corba_EXCLUDE_FILES += \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	287	com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	288	com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	289	com/sun/org/omg/CORBA/IDLTypeOperations.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	290	com/sun/org/omg/CORBA/IRObjectOperations.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	291	org/omg/PortableInterceptor/UNKNOWN.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	292	com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	293	com/sun/corba/se/impl/presentation/rmi/jndi.properties \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	294	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	295
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	296	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	297
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	298	java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	299	java.xml_CLEAN := .properties
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.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	304	java.xml.bind_CLEAN := .properties
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.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	309	java.xml.soap_CLEAN := .properties
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.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	314	java.xml.ws_COPY := .xml
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	315	java.xml.ws_CLEAN := .properties
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
41271 7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	319	java.naming_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.' -Xlint:-exports
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	320	java.naming_CLEAN := jndiprovider.properties
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
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	324	java.security.saaj_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	325	java.security.saaj_CLEAN := .properties
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
29863 403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	329	java.security.jgss_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	330
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	331	################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	332
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	333	java.smartcardio_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules darcy parents: 29672 diff changeset	334
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
29313 36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo darcy parents: 29169 diff changeset	337	java.xml.crypto_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.,javax.'
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	338	java.xml.crypto_COPY := .dtd .xml
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	339	java.xml.crypto_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	340
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	341	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	342
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	343	jdk.charsets_COPY := .dat
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	344
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	345	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	346
41271 7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	347	jdk.accessibility_ADD_JAVAC_FLAGS := -Xlint:-exports
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	348
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	349	################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	350
41661 d759799570f8 8131019: jshell tool: access javadoc from tool jlahoda parents: 41658 diff changeset	351	jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.,-jdk.internal.' \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	352	-XDstringConcat=inline
27560 adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	353	jdk.compiler_CLEAN_FILES := $(wildcard \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	354	$(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
adc258b13e2c 8049367: Modular Run-Time Images chegar parents: 27397 diff changeset	355	sun/tools/serialver/resources))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	356
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	357	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	358
34116 b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33723 diff changeset	359	jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
36290 68b6b8f114b6 8150723: HSDB toolbar icons are missing. ysuenaga parents: 35442 diff changeset	360	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	361
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33723 diff changeset	362	################################################################################
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles erikj parents: 33723 diff changeset	363
41870 5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	364	jdk.editpad_COPY := .properties
5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	365
5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	366	################################################################################
5a5934e56107 8168974: Editor support: include properties file in image rfield parents: 41661 diff changeset	367
31512 756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	368	jdk.internal.le_COPY := .properties
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	369
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	370	################################################################################
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs jlahoda parents: 31310 diff changeset	371
27595 cff167b3bfa2 8065914: Various improvements and cleanup of build system ihse parents: 27586 diff changeset	372	jdk.jcmd_COPY := _options
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	373
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	374	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	375
34099 64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	376	jdk.dynalink_CLEAN := .properties
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	377
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	378	################################################################################
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink attila parents: 33723 diff changeset	379
33723 b09ccef0313a 8142367: Allow files with .png extension to be copied for javadoc bpatel parents: 33045 diff changeset	380	jdk.javadoc_COPY := .xml .css .js .png
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
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	384	jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	385	jdk.rmic_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	386
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	387	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	388
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	389	# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	390	SCTP_IMPL_CLASSES = \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	391	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	392	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	393	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	394	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	395	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	396	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	397	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	398	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	399	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	400	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	401	$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	402
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	403	ifeq ($(OPENJDK_TARGET_OS), macosx)
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	404	jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	405	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	406
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	407	ifeq ($(OPENJDK_TARGET_OS),aix)
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	408	jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	409	endif
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	410
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	411	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	412
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	413	jdk.jconsole_COPY := .gif .png
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	414
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	415	jdk.jconsole_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	416	$(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	417
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	418	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	419
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	420	jdk.jdeps_COPY := .txt
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	421
30742 679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	422	jdk.jdeps_CLEAN_FILES := $(wildcard \
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	423	$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	424	$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	425
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	426	################################################################################
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module mchung parents: 30426 diff changeset	427
27397 25afb1340d37 8064372: CompileJavaModules overwrites settings from custom rriggs parents: 27240 diff changeset	428	jdk.jdi_EXCLUDES += \
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	429	com/sun/tools/example/debug/bdi \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	430	com/sun/tools/example/debug/event \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	431	com/sun/tools/example/debug/gui \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	432	com/sun/jdi/doc-files \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	433	#
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	434
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	435	jdk.jdi_EXCLUDE_FILES += jdi-overview.html
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	436
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	437	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	438
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	439	jdk.dev_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	440	$(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	441	com/sun/tools/script/shell))
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	442
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	443	jdk.dev_COPY := .js oqlhelp.html .txt
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	444
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.jvmstat_COPY := aliasmap
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
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	451	# -parameters provides method's parameters information in class file,
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	452	# 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	453	# Don't use Indy strings concatenation to have good JVMCI startup performance.
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	454
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	455	jdk.vm.ci_ADD_JAVAC_FLAGS := -parameters -Xlint:-exports -XDstringConcat=inline
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	456
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	457	################################################################################
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	458
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	459	jdk.vm.compiler_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	460
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	461	jdk.vm.compiler_EXCLUDES += \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	462	org.graalvm.compiler.core.match.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	463	org.graalvm.compiler.nodeinfo.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	464	org.graalvm.compiler.options.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	465	org.graalvm.compiler.serviceprovider.processor \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	466	org.graalvm.compiler.replacements.verifier \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	467	org.graalvm.compiler.api.directives.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	468	org.graalvm.compiler.api.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	469	org.graalvm.compiler.asm.aarch64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	470	org.graalvm.compiler.asm.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	471	org.graalvm.compiler.asm.sparc.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	472	org.graalvm.compiler.asm.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	473	org.graalvm.compiler.core.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	474	org.graalvm.compiler.core.sparc.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	475	org.graalvm.compiler.core.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	476	org.graalvm.compiler.debug.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	477	org.graalvm.compiler.graph.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	478	org.graalvm.compiler.hotspot.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	479	org.graalvm.compiler.hotspot.lir.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	480	org.graalvm.compiler.hotspot.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	481	org.graalvm.compiler.jtt \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	482	org.graalvm.compiler.lir.jtt \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	483	org.graalvm.compiler.lir.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	484	org.graalvm.compiler.microbenchmarks \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	485	org.graalvm.compiler.nodes.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	486	org.graalvm.compiler.options.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	487	org.graalvm.compiler.phases.common.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	488	org.graalvm.compiler.replacements.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	489	org.graalvm.compiler.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	490	org.graalvm.compiler.virtual.bench \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	491	#
41271 7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	492
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	493	################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible jlahoda parents: 40783 diff changeset	494
42532 4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	495	jdk.aot_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	496
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	497	################################################################################
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	498
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	499	jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	500	jdk.xml.bind_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	501	jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	502
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	503	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	504
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	505	jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	506	jdk.xml.ws_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	507
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	508	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	509
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	510	sun.charsets_COPY := .dat
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	511
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	512	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	513
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	514	jdk.localedata_COPY := _dict _th
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	515	# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	516	# 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	517	jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	518
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	519	################################################################################
41658 14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	520	# 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	521	# 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	522	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	523	$(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	524	endif
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	525
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module erikj parents: 41656 diff changeset	526	################################################################################
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	527	# Setup the compilation for the module
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	528	#
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	529	MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	530
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	531	# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	532	# 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	533	# be recompiled. If multiple paths are separated by comma, convert that into a
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	534	# space separated list.
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	535	JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
38847 57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	536	ifeq ($(JDK_FILTER), )
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	537	FAIL_NO_SRC := true
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	538	else
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	539	# When using JDK_FILTER, most module java compilations will end up finding
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	540	# no source files. Don't let that fail the build.
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	541	FAIL_NO_SRC := false
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	542	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	543
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	544	# Get the complete module source path.
e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	545	MODULESOURCEPATH := $(call GetModuleSrcPath)
31014 a3b1e5a584bd 8054717: SJavac should track changes in the public apis of classpath classes! alundblad parents: 30742 diff changeset	546
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	547	# Add imported modules to the modulepath
e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	548	MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	549
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	550	ifeq ($(MODULE), jdk.vm.ci)
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	551	## WORKAROUND jdk.vm.ci source structure issue
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	552	JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	553	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	554	$(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
37030 e047c2f3f510 8153969: Clean up module src dir logic erikj parents: 36787 diff changeset	555	MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	556	endif
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	557
42531 37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	558	ifeq ($(MODULE), jdk.vm.compiler)
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	559	## WORKAROUND jdk.vm.compiler source structure issue
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	560	VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	561	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	562	$(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	563	MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	564	endif
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler kvn parents: 42302 diff changeset	565
42532 4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	566	ifeq ($(MODULE), jdk.aot)
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	567	## WORKAROUND jdk.aot source structure issue
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	568	AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	569	$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	570	$(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	571	MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	572	endif
4780f4130eb0 8171008: Integrate AOT compiler into JDK kvn parents: 42531 diff changeset	573
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	574	$(eval $(call SetupJavaCompilation, $(MODULE), \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	575	SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	576	MODULE := $(MODULE), \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	577	SRC := $(wildcard $(MODULE_SRC_DIRS)), \
38847 57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	578	INCLUDES := $(JDK_USER_DEFINED_FILTER), \
57689ec78480 8055735: JDK_FILTER is broken erikj parents: 37766 diff changeset	579	FAIL_NO_SRC := $(FAIL_NO_SRC), \
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	580	BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	581	HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	582	ADD_JAVAC_FLAGS := \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	583	$($(MODULE)_ADD_JAVAC_FLAGS) \
40241 59abac94e4f2 8136930: Simplify use of module-system options by custom launchers mchung parents: 39610 diff changeset	584	--module-source-path $(MODULESOURCEPATH) \
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers mchung parents: 39610 diff changeset	585	--module-path $(MODULEPATH) \
40611 53ba2f7abd45 8160851: Remove old launcher module-related options mchung parents: 40241 diff changeset	586	--system none, \
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	587	))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	588
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	589	TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	590
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	591	# 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	592	# 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	593	# 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	594	# 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	595	# dependency declaration to that by using the *_COMPILE_TARGET variable.
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	596	$($(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	597	$(call SetupJavaCompilationCompileTarget, $d, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	598	$(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	599
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	600	################################################################################
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	601	# Copy zh_HK properties files from zh_TW
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	602
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	603	$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	604	$(install-file)
98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	605
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	606	CreateHkTargets = \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	607	$(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	608	$(subst /share/classes,, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	609	$(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	610
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	611	ifeq ($(MODULE), java.sql.rowset)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	612	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	613	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	614
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	615	ifeq ($(MODULE), java.rmi)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	616	TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	617	endif
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	618
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	619	################################################################################
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	620	# If this is an imported module, copy the pre built classes and resources into
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	621	# the modules output dir
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	622
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	623	ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	624	$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	625	$(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
37037 4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed erikj parents: 37030 diff changeset	626	$(call MakeDir, $(@D))
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed erikj parents: 37030 diff changeset	627	# 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	628	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
36506 17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	629	$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	630	$(TOUCH) $@
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	631
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	632	TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	633
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	634	# Add this dependency to avoid a race between compiling module-info.java and
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	635	# importing the classes.
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	636	$($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	637	endif
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	638
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	639	################################################################################
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	640
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	641	$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	642
17612cee3530 8142968: Module System implementation alanb parents: 36290 diff changeset	643	################################################################################
25854 98ce0879ab4c 8054834: Modular Source Code chegar parents: diff changeset	644
34102 c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	645	all: $(TARGETS)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	646
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest erikj parents: 34099 diff changeset	647	.PHONY: all

author	kvn
	Sun, 11 Dec 2016 18:50:18 -0800
changeset 42532	4780f4130eb0
parent 42531	37ee95196b17
child 42534	f489cf041782
permissions	-rw-r--r--