make/CompileJavaModules.gmk
author redestad
Thu, 10 Oct 2019 13:26:22 +0200
changeset 58537 30a9612a657d
parent 55013 8dae495a59e7
child 57384 4a296d9a76a0
permissions -rw-r--r--
8232050: Improve inlining of Klass accessors Reviewed-by: lfoltan, tschatzl, coleenp, dholmes, jiangli
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     1
#
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
     2
# Copyright (c) 2014, 2019, 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.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47217
diff changeset
    36
$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
25854
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
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
    41
java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
55013
8dae495a59e7 8221431: Support for Unicode 12.1
naoto
parents: 54601
diff changeset
    42
java.base_COPY += .icu .dat .spp .nrm content-types.properties hijrah-config-islamic-umalqura.properties
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
    43
java.base_CLEAN += intrinsic.properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    44
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
    45
java.base_EXCLUDE_FILES += \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
    46
  $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
    47
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    48
java.base_EXCLUDES += java/lang/doc-files
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    49
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    50
# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    51
# data files and shouldn't go in the product
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    52
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    53
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
    54
ifeq ($(call isTargetOs, solaris), false)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    55
  java.base_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    56
      SolarisLoginModule.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    57
      SolarisSystem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    58
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    59
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    60
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
    61
ifeq ($(call isTargetOs, solaris macosx aix), false)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    62
  java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    63
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    64
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
    65
ifeq ($(call isTargetOs, windows), true)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    66
  java.base_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    67
      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    68
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    69
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    70
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    71
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    72
54139
b6134b6d75ff 8220249: fix headings in java.compiler
jjg
parents: 54135
diff changeset
    73
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
    74
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents: 29313
diff changeset
    75
################################################################################
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents: 29313
diff changeset
    76
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
    77
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
    78
java.datatransfer_COPY += flavormap.properties
28903
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
    79
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
    80
################################################################################
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
    81
54408
8fe16bf92ebd 8221731: Fix doclint handling of accessibility heading in java.desktop
psadhukhan
parents: 54139
diff changeset
    82
java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference \
45228
b32e004375c1 8180318: Enable HTML 5 checking at compile time
ihse
parents: 44830
diff changeset
    83
    '-Xdoclint/package:java.*,javax.*' -Xlint:exports \
b32e004375c1 8180318: Enable HTML 5 checking at compile time
ihse
parents: 44830
diff changeset
    84
    --doclint-format html4
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
    85
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
    86
java.desktop_CLEAN += iio-plugin.properties cursors.properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    87
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    88
java.desktop_EXCLUDES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    89
    java/awt/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    90
    javax/swing/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    91
    javax/swing/text/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    92
    javax/swing/plaf/synth/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    93
    javax/swing/undo/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    94
    sun/awt/X11/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    95
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    96
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    97
java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    98
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    99
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   100
    javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   101
    javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   102
    javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   103
    javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   104
    javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   105
    sun/awt/resources/security-icon-bw16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   106
    sun/awt/resources/security-icon-bw24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   107
    sun/awt/resources/security-icon-bw32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   108
    sun/awt/resources/security-icon-bw48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   109
    sun/awt/resources/security-icon-interim16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   110
    sun/awt/resources/security-icon-interim24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   111
    sun/awt/resources/security-icon-interim32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   112
    sun/awt/resources/security-icon-interim48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   113
    sun/awt/resources/security-icon-yellow16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   114
    sun/awt/resources/security-icon-yellow24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   115
    sun/awt/resources/security-icon-yellow32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   116
    sun/awt/resources/security-icon-yellow48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   117
    sun/awt/X11/java-icon16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   118
    sun/awt/X11/java-icon24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   119
    sun/awt/X11/java-icon32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   120
    sun/awt/X11/java-icon48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   121
    .template \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   122
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   123
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
   124
ifeq ($(call isTargetOs, macosx), true)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   125
  # exclude all X11 on Mac.
29671
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   126
  java.desktop_EXCLUDES += \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   127
      sun/awt/X11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   128
      sun/java2d/x11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   129
      sun/java2d/jules \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   130
      sun/java2d/xr \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   131
      com/sun/java/swing/plaf/gtk \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   132
      #
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   133
  java.desktop_EXCLUDE_FILES += \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   134
      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   135
      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   136
      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   137
      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   138
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   139
else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   140
  # TBD: figure out how to eliminate this long list
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   141
  java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   142
      sun/awt/X11/ScreenFormat.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   143
      sun/awt/X11/XArc.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   144
      sun/awt/X11/XChar2b.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   145
      sun/awt/X11/XCharStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   146
      sun/awt/X11/XClassHint.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   147
      sun/awt/X11/XComposeStatus.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   148
      sun/awt/X11/XExtCodes.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   149
      sun/awt/X11/XFontProp.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   150
      sun/awt/X11/XFontSetExtents.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   151
      sun/awt/X11/XFontStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   152
      sun/awt/X11/XGCValues.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   153
      sun/awt/X11/XHostAddress.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   154
      sun/awt/X11/XIMCallback.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   155
      sun/awt/X11/XIMHotKeyTrigger.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   156
      sun/awt/X11/XIMHotKeyTriggers.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   157
      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   158
      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   159
      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   160
      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   161
      sun/awt/X11/XIMStringConversionCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   162
      sun/awt/X11/XIMStringConversionText.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   163
      sun/awt/X11/XIMStyles.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   164
      sun/awt/X11/XIMText.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   165
      sun/awt/X11/XIMValuesList.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   166
      sun/awt/X11/XImage.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   167
      sun/awt/X11/XKeyboardControl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   168
      sun/awt/X11/XKeyboardState.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   169
      sun/awt/X11/XOMCharSetList.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   170
      sun/awt/X11/XOMFontInfo.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   171
      sun/awt/X11/XOMOrientation.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   172
      sun/awt/X11/XPoint.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   173
      sun/awt/X11/XRectangle.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   174
      sun/awt/X11/XSegment.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   175
      sun/awt/X11/XStandardColormap.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   176
      sun/awt/X11/XTextItem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   177
      sun/awt/X11/XTextItem16.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   178
      sun/awt/X11/XTextProperty.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   179
      sun/awt/X11/XTimeCoord.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   180
      sun/awt/X11/XWindowChanges.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   181
      sun/awt/X11/XdbeSwapInfo.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   182
      sun/awt/X11/XmbTextItem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   183
      sun/awt/X11/XwcTextItem.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   184
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   185
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
   186
ifeq ($(call isTargetOs, windows), true)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   187
  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   188
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   189
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   190
ifdef BUILD_HEADLESS_ONLY
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   191
  java.desktop_EXCLUDES += sun/applet
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   192
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   193
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
   194
ifeq ($(call isTargetOs, windows macosx), false)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   195
  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   196
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   197
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   198
# These files do not appear in the build result of the old build. This
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   199
# is because they are generated sources, but the AUTO_JAVA_FILES won't
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   200
# pick them up since they aren't generated when the source dirs are
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   201
# searched and they aren't referenced by any other classes so they won't
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   202
# be picked up by implicit compilation. On a rebuild, they are picked up
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   203
# and compiled. Exclude them here to produce the same rt.jar as the old
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   204
# build does when building just once.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   205
java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   206
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   207
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   208
    javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   209
    javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   210
    javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   211
    javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   212
    javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   213
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   214
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   215
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   216
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   217
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
   218
java.scripting_COPY += .js
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   219
java.scripting_CLEAN += .properties
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   220
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   221
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   222
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   223
java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   224
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   225
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   226
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   227
java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*'
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   228
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   229
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   230
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   231
java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*'
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   232
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   233
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   234
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   235
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
   236
0a0861e1db57 8173607: JMX RMI connector should be in its own module
dfuchs
parents: 43054
diff changeset
   237
################################################################################
0a0861e1db57 8173607: JMX RMI connector should be in its own module
dfuchs
parents: 43054
diff changeset
   238
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   239
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
   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
49126
f29637bb390e 8197533: Move javax.transaction.xa to its own module
lancea
parents: 48888
diff changeset
   243
java.transaction.xa_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*'
f29637bb390e 8197533: Move javax.transaction.xa to its own module
lancea
parents: 48888
diff changeset
   244
f29637bb390e 8197533: Move javax.transaction.xa to its own module
lancea
parents: 48888
diff changeset
   245
################################################################################
f29637bb390e 8197533: Move javax.transaction.xa to its own module
lancea
parents: 48888
diff changeset
   246
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   247
java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   248
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   249
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   250
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   251
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   252
java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   253
java.sql.rowset_CLEAN_FILES += $(wildcard \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   254
    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   255
    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   256
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   257
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   258
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   259
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
   260
java.rmi_CLEAN_FILES += $(wildcard \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   261
    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   262
    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   263
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   264
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   265
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   266
java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility \
48041
2743e489189e 8191938: Fix lint warnings in JAXP repo: a few Deprecation warrnings and enable -Xlint:all
joehw
parents: 47704
diff changeset
   267
    '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
2743e489189e 8191938: Fix lint warnings in JAXP repo: a few Deprecation warrnings and enable -Xlint:all
joehw
parents: 47704
diff changeset
   268
    javax.xml.transform javax.xml.validation javax.xml.xpath)'
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   269
java.xml_CLEAN += .properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   270
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   271
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   272
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   273
java.naming_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' -Xlint:-exports
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   274
java.naming_CLEAN += jndiprovider.properties
25854
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
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   278
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
   279
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   280
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   281
54135
67f72165dca5 8220379: Fix doclint handling of headings
jjg
parents: 54084
diff changeset
   282
java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   283
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   284
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   285
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   286
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
   287
java.xml.crypto_COPY += .dtd .xml
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   288
java.xml.crypto_CLEAN += .properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   289
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   290
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   291
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   292
jdk.charsets_COPY += .dat
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   293
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   294
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   295
41271
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   296
################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   297
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   298
jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   299
    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   300
    -XDstringConcat=inline
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   301
jdk.compiler_CLEAN_FILES += $(wildcard \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   302
    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   303
        sun/tools/serialver/resources))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   304
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   305
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   306
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   307
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
   308
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
   309
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   310
################################################################################
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   311
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   312
jdk.editpad_COPY += .properties
41870
5a5934e56107 8168974: Editor support: include properties file in image
rfield
parents: 41661
diff changeset
   313
5a5934e56107 8168974: Editor support: include properties file in image
rfield
parents: 41661
diff changeset
   314
################################################################################
5a5934e56107 8168974: Editor support: include properties file in image
rfield
parents: 41661
diff changeset
   315
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   316
jdk.jshell_COPY += .jsh .properties
42859
44601aa03c2d 8172155: jshell tool (make): include built-in startup scripts in image
rfield
parents: 42534
diff changeset
   317
44601aa03c2d 8172155: jshell tool (make): include built-in startup scripts in image
rfield
parents: 42534
diff changeset
   318
################################################################################
44601aa03c2d 8172155: jshell tool (make): include built-in startup scripts in image
rfield
parents: 42534
diff changeset
   319
52938
5ff7480c9e28 8214491: Upgrade to JLine 3.9.0
jlahoda
parents: 52910
diff changeset
   320
jdk.internal.le_COPY += .properties .caps .txt
31512
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   321
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   322
################################################################################
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   323
50428
8c88df2e8a78 8203891: Upgrade JOpt Simple to 5.0.4
jlahoda
parents: 50330
diff changeset
   324
jdk.internal.opt_COPY += .properties
8c88df2e8a78 8203891: Upgrade JOpt Simple to 5.0.4
jlahoda
parents: 50330
diff changeset
   325
8c88df2e8a78 8203891: Upgrade JOpt Simple to 5.0.4
jlahoda
parents: 50330
diff changeset
   326
################################################################################
8c88df2e8a78 8203891: Upgrade JOpt Simple to 5.0.4
jlahoda
parents: 50330
diff changeset
   327
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   328
jdk.jcmd_COPY += _options
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   329
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   330
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   331
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   332
jdk.dynalink_CLEAN += .properties
34099
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   333
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   334
################################################################################
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   335
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   336
jdk.javadoc_COPY += .xml .css .js .png
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   337
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   338
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   339
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   340
jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline
43054
14ae60f2a31c 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42859
diff changeset
   341
14ae60f2a31c 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42859
diff changeset
   342
################################################################################
14ae60f2a31c 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42859
diff changeset
   343
50878
fb7800b66c92 8204492: Add deprecation annotation to Nashorn APIs and warning to nashorn, jjs
sundar
parents: 50590
diff changeset
   344
jdk.scripting.nashorn_ADD_JAVAC_FLAGS += $(DISABLE_WARNINGS),-overrides
50313
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   345
jdk.scripting.nashorn_COPY := .properties .js
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   346
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   347
################################################################################
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   348
50878
fb7800b66c92 8204492: Add deprecation annotation to Nashorn APIs and warning to nashorn, jjs
sundar
parents: 50590
diff changeset
   349
jdk.scripting.nashorn.shell_ADD_JAVAC_FLAGS += $(DISABLE_WARNINGS),-overrides
47704
38aa08d2ec6c 8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents: 47398
diff changeset
   350
jdk.scripting.nashorn.shell_COPY += .js .properties
38aa08d2ec6c 8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents: 47398
diff changeset
   351
38aa08d2ec6c 8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents: 47398
diff changeset
   352
################################################################################
38aa08d2ec6c 8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents: 47398
diff changeset
   353
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   354
jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   355
jdk.rmic_CLEAN += .properties
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
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   359
# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   360
SCTP_IMPL_CLASSES = \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   361
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   362
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   363
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   364
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   365
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   366
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   367
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   368
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   369
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   370
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   371
    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   372
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
   373
ifeq ($(call isTargetOs, macosx), true)
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   374
  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   375
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   376
53683
48ff68e2fe5c 8218431: Improved platform checking in makefiles
ihse
parents: 52938
diff changeset
   377
ifeq ($(call isTargetOs, aix), true)
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   378
  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   379
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   380
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   381
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   382
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   383
jdk.jconsole_COPY += .gif .png
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   384
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   385
jdk.jconsole_CLEAN_FILES += $(wildcard \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   386
    $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
25854
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
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   390
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
   391
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   392
jdk.jdeps_CLEAN_FILES += $(wildcard \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   393
    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   394
    $(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
   395
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   396
################################################################################
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   397
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   398
jdk.jdi_EXCLUDES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   399
    com/sun/tools/example/debug/bdi \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   400
    com/sun/tools/example/debug/event \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   401
    com/sun/tools/example/debug/gui \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   402
    com/sun/jdi/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   403
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   404
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   405
jdk.jdi_EXCLUDE_FILES += jdi-overview.html
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   406
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   407
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   408
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   409
jdk.dev_CLEAN_FILES += $(wildcard \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   410
    $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   411
        com/sun/tools/script/shell))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   412
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   413
jdk.dev_COPY += .js oqlhelp.html .txt
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   414
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   415
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   416
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   417
jdk.internal.jvmstat_COPY += aliasmap
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   418
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   419
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   420
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   421
# -parameters provides method's parameters information in class file,
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   422
# 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
   423
# 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
   424
# The exports are needed since JVMCI is dynamically exported (see
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   425
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   426
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   427
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
   428
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   429
################################################################################
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   430
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   431
jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
44830
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   432
    --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
   433
    --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
   434
    --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
   435
    --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
   436
    --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
   437
    --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
   438
    --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
   439
    --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
   440
    --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
   441
    --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
   442
    --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
   443
    --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
   444
    --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
   445
    #
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   446
43925
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43397
diff changeset
   447
jdk.internal.vm.compiler_EXCLUDES += \
49873
26ebfe8ce852 8199755: Update Graal
dlong
parents: 49417
diff changeset
   448
    jdk.internal.vm.compiler.collections.test \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   449
    jdk.tools.jaotc.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   450
    org.graalvm.compiler.api.directives.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   451
    org.graalvm.compiler.api.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   452
    org.graalvm.compiler.asm.aarch64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   453
    org.graalvm.compiler.asm.amd64.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   454
    org.graalvm.compiler.asm.sparc.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   455
    org.graalvm.compiler.asm.test \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   456
    org.graalvm.compiler.core.aarch64.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   457
    org.graalvm.compiler.core.amd64.test \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   458
    org.graalvm.compiler.core.jdk9.test \
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   459
    org.graalvm.compiler.core.match.processor \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   460
    org.graalvm.compiler.core.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   461
    org.graalvm.compiler.debug.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   462
    org.graalvm.compiler.graph.test \
54601
c40b2a190173 8221598: Update Graal
jwilhelm
parents: 54410
diff changeset
   463
    org.graalvm.compiler.hotspot.aarch64.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   464
    org.graalvm.compiler.hotspot.amd64.test \
54084
84f10bbf993f 8218074: Update Graal
jwilhelm
parents: 54076
diff changeset
   465
    org.graalvm.compiler.hotspot.jdk9.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   466
    org.graalvm.compiler.hotspot.lir.test \
48861
47f19ff9903c 8194819: Update Graal
iveresov
parents: 48041
diff changeset
   467
    org.graalvm.compiler.hotspot.sparc.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   468
    org.graalvm.compiler.hotspot.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   469
    org.graalvm.compiler.jtt \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   470
    org.graalvm.compiler.lir.jtt \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   471
    org.graalvm.compiler.lir.test \
46199
1044e61f255d 8177046: Update Graal
iveresov
parents: 43926
diff changeset
   472
    org.graalvm.compiler.loop.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   473
    org.graalvm.compiler.microbenchmarks \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   474
    org.graalvm.compiler.nodeinfo.processor \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   475
    org.graalvm.compiler.nodes.test \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   476
    org.graalvm.compiler.options.processor \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   477
    org.graalvm.compiler.options.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   478
    org.graalvm.compiler.phases.common.test \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   479
    org.graalvm.compiler.processor \
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   480
    org.graalvm.compiler.replacements.jdk12.test \
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   481
    org.graalvm.compiler.replacements.jdk9.test \
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   482
    org.graalvm.compiler.replacements.processor \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   483
    org.graalvm.compiler.replacements.test \
52578
7dd81e82d083 8210777: Update Graal
dlong
parents: 51436
diff changeset
   484
    org.graalvm.compiler.serviceprovider.processor \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   485
    org.graalvm.compiler.test \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   486
    org.graalvm.compiler.virtual.bench \
46245
78ed78bcf35f 8186158: Update Graal
iveresov
parents: 46231
diff changeset
   487
    org.graalvm.micro.benchmarks \
46199
1044e61f255d 8177046: Update Graal
iveresov
parents: 43926
diff changeset
   488
    org.graalvm.util.test \
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   489
    #
41271
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   490
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   491
################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   492
44830
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   493
# -parameters provides method's parameters information in class file,
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   494
# JVMCI compilers make use of that information for various sanity checks.
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   495
# 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
   496
# The exports are needed since JVMCI is dynamically exported (see
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   497
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   498
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   499
jdk.aot_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
44830
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 43926
diff changeset
   500
    --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
   501
    --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
   502
    --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
   503
    --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
   504
    --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
   505
    --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
   506
    --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
   507
    --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
   508
    --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
   509
    --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
   510
    --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
   511
    --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
   512
    --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
   513
    #
41271
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   514
51436
091c0d22e735 8206992: Update Graal
iveresov
parents: 51207
diff changeset
   515
jdk.aot_EXCLUDES += \
091c0d22e735 8206992: Update Graal
iveresov
parents: 51207
diff changeset
   516
    jdk.tools.jaotc.test
091c0d22e735 8206992: Update Graal
iveresov
parents: 51207
diff changeset
   517
    #
091c0d22e735 8206992: Update Graal
iveresov
parents: 51207
diff changeset
   518
41271
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   519
################################################################################
7d6ee074cd12 8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents: 40783
diff changeset
   520
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   521
sun.charsets_COPY += .dat
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   522
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   523
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   524
47064
c01273781922 8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents: 46245
diff changeset
   525
jdk.localedata_COPY += _dict _th
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   526
# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   527
# 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
   528
jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java
50590
5fa19bad622d 8204973: Add build support for filtering translations
erikj
parents: 50428
diff changeset
   529
jdk.localedata_KEEP_ALL_TRANSLATIONS := true
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   530
################################################################################
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   531
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   532
# There is an issue in sjavac that triggers a warning in jdk.jfr that isn't
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   533
# triggered without sjavac.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   534
ifeq ($(ENABLE_SJAVAC), yes)
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   535
  jdk.jfr_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   536
endif
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   537
jdk.jfr_COPY := .xsd .xml .dtd
caf115bb98ad 8199712: Flight Recorder
egahlin
parents: 49873
diff changeset
   538
jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline -Xlint:-exports
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   539
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   540
################################################################################
41658
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41656
diff changeset
   541
# 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
   542
# module-info.java.
54076
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   543
ifneq ($(IMPORT_MODULES_CLASSES), )
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   544
  IMPORT_MODULE_DIR := $(IMPORT_MODULES_CLASSES)/$(MODULE)
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   545
  ifneq ($(wildcard $(IMPORT_MODULE_DIR)), )
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   546
    $(MODULE)_INCLUDE_FILES := module-info.java
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   547
  endif
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   548
else
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   549
  IMPORT_MODULE_DIR :=
41658
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41656
diff changeset
   550
endif
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41656
diff changeset
   551
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41656
diff changeset
   552
################################################################################
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   553
# Setup the compilation for the module
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   554
#
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   555
MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   556
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   557
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   558
# 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
   559
# be recompiled. If multiple paths are separated by comma, convert that into a
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   560
# space separated list.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   561
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
38847
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   562
ifeq ($(JDK_FILTER), )
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   563
  FAIL_NO_SRC := true
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   564
else
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   565
  # When using JDK_FILTER, most module java compilations will end up finding
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   566
  # no source files. Don't let that fail the build.
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   567
  FAIL_NO_SRC := false
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   568
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   569
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   570
# Get the complete module source path.
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   571
MODULESOURCEPATH := $(call GetModuleSrcPath)
31014
a3b1e5a584bd 8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents: 30742
diff changeset
   572
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   573
# Add imported modules to the modulepath
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   574
MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   575
43925
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43397
diff changeset
   576
ifeq ($(MODULE), jdk.internal.vm.ci)
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43397
diff changeset
   577
  ## WORKAROUND jdk.internal.vm.ci source structure issue
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   578
  JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   579
      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   580
          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   581
  MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   582
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   583
43925
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43397
diff changeset
   584
ifeq ($(MODULE), jdk.internal.vm.compiler)
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43397
diff changeset
   585
  ## WORKAROUND jdk.internal.vm.compiler source structure issue
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   586
  VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   587
      $(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
   588
          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   589
  MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   590
endif
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42302
diff changeset
   591
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   592
ifeq ($(MODULE), jdk.aot)
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   593
  ## WORKAROUND jdk.aot source structure issue
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   594
  AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   595
      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47081
diff changeset
   596
          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   597
  MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   598
endif
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   599
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   600
$(eval $(call SetupJavaCompilation, $(MODULE), \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   601
    SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   602
    MODULE := $(MODULE), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   603
    SRC := $(wildcard $(MODULE_SRC_DIRS)), \
38847
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   604
    INCLUDES := $(JDK_USER_DEFINED_FILTER), \
57689ec78480 8055735: JDK_FILTER is broken
erikj
parents: 37766
diff changeset
   605
    FAIL_NO_SRC := $(FAIL_NO_SRC), \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   606
    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   607
    HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
47398
1fd27535bc57 8182285: Speeding up incremental build by hashing module APIs
erikj
parents: 47314
diff changeset
   608
    CREATE_API_DIGEST := true, \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   609
    ADD_JAVAC_FLAGS := \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   610
        $($(MODULE)_ADD_JAVAC_FLAGS) \
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39610
diff changeset
   611
        --module-source-path $(MODULESOURCEPATH) \
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39610
diff changeset
   612
        --module-path $(MODULEPATH) \
40611
53ba2f7abd45 8160851: Remove old launcher module-related options
mchung
parents: 40241
diff changeset
   613
        --system none, \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   614
))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   615
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   616
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   617
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   618
# 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
   619
# 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
   620
# 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
   621
# 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
   622
# dependency declaration to that by using the *_COMPILE_TARGET variable.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   623
$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
47398
1fd27535bc57 8182285: Speeding up incremental build by hashing module APIs
erikj
parents: 47314
diff changeset
   624
    $(call SetupJavaCompilationApiTarget, $d, \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   625
        $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   626
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   627
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   628
# Copy zh_HK properties files from zh_TW
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   629
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   630
$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   631
	$(install-file)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   632
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   633
CreateHkTargets = \
51207
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   634
    $(call FilterExcludedTranslations, \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   635
       $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   636
         $(subst /share/classes,, \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   637
            $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   638
         ) \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   639
       ), \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   640
       .properties \
fc24da4898f1 8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents: 50878
diff changeset
   641
    )
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   642
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   643
ifeq ($(MODULE), java.sql.rowset)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   644
  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
   645
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   646
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   647
ifeq ($(MODULE), java.rmi)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   648
  TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   649
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   650
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   651
################################################################################
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   652
# If this is an imported module, copy the pre built classes and resources into
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   653
# the modules output dir
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   654
54076
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   655
ifneq ($(wildcard $(IMPORT_MODULE_DIR)), )
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   656
  $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
54380
e297c7bb6469 8189861: Refactor CacheFind
erikj
parents: 54139
diff changeset
   657
      $(call FindFiles, $(IMPORT_MODULE_DIR))
37037
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents: 37030
diff changeset
   658
	$(call MakeDir, $(@D))
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents: 37030
diff changeset
   659
        # 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
   660
	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
54076
4b4745d185eb 8220383: Incremental build is broken and inefficient
erikj
parents: 53683
diff changeset
   661
	$(CP) -R $(IMPORT_MODULE_DIR)/* $(@D)/
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   662
	$(TOUCH) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   663
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   664
  TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   665
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   666
  # Add this dependency to avoid a race between compiling module-info.java and
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   667
  # importing the classes.
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   668
  $($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   669
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   670
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   671
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   672
50313
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   673
ifeq ($(MODULE), jdk.scripting.nashorn)
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   674
  include CompileJavaModulesNashorn.gmk
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   675
endif
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   676
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   677
################################################################################
7c40e39e38a1 8203945: Cleanup nashorn build
erikj
parents: 50113
diff changeset
   678
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47217
diff changeset
   679
$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   680
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   681
################################################################################
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   682
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   683
all: $(TARGETS)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   684
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   685
.PHONY: all