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