make/CompileJavaModules.gmk
author ccheung
Tue, 07 Jun 2016 00:06:17 +0000
changeset 39211 8e8b396a42e9
parent 37766 dc5728bbbb36
child 38847 57689ec78480
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     1
#
36787
402e5e40f6e5 7179078: Remove @beaninfo processing from the makefiles
serb
parents: 36506
diff changeset
     2
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     4
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    10
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    15
# accompanied this code).
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    16
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    20
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    23
# questions.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    24
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    25
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    26
# This must be the first rule
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    27
default: all
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    28
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    29
include $(SPEC)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    30
include MakeBase.gmk
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents: 26115
diff changeset
    31
include Modules.gmk
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    32
include JavaCompilation.gmk
26115
7a9dc384f3c8 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25854
diff changeset
    33
include SetupJavaCompilers.gmk
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    34
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    35
# Hook to include the corresponding custom file, if present.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    36
$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    37
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    38
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    39
# Module specific build settings
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    40
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    41
java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    42
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    43
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    44
35366
394a28cc1032 8148483: JEP 280: Indify String Concatenation
shade
parents: 35024
diff changeset
    45
java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
27240
a2a7d337e3b7 8048124: Read hijra-config-umalqura.properties as a resource
rriggs
parents: 27137
diff changeset
    46
java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    47
java.base_CLEAN := intrinsic.properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    48
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
    49
java.base_EXCLUDE_FILES += \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
    50
  $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
    51
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    52
java.base_EXCLUDES += java/lang/doc-files
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    53
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    54
# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    55
# data files and shouldn't go in the product
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    56
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    57
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    58
ifeq ($(OPENJDK_TARGET_OS), macosx)
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29863
diff changeset
    59
  java.base_EXCLUDE_FILES += sun/nio/fs/GnomeFileTypeDetector.java
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    60
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    61
34108
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    62
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
    63
  java.base_EXCLUDE_FILES += \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    64
      sun/nio/ch/AbstractPollSelectorImpl.java \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    65
      sun/nio/ch/PollSelectorImpl.java \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    66
      sun/nio/ch/PollSelectorProvider.java \
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    67
      #
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    68
endif
671dd84efa14 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents: 34102
diff changeset
    69
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    70
ifneq ($(OPENJDK_TARGET_OS), solaris)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    71
  java.base_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    72
      SolarisLoginModule.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    73
      SolarisSystem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    74
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    75
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    76
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    77
ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    78
  #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    79
  # only solaris, macosx and aix
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    80
  #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    81
  java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    82
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    83
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    84
ifeq ($(OPENJDK_TARGET_OS), windows)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    85
  java.base_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    86
      sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    87
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    88
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    89
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    90
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    91
29437
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents: 29313
diff changeset
    92
java.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents: 29313
diff changeset
    93
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents: 29313
diff changeset
    94
################################################################################
807b7c4a4e62 8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents: 29313
diff changeset
    95
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
    96
java.datatransfer_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
28903
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
    97
java.datatransfer_COPY := flavormap.properties
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
    98
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
    99
################################################################################
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
   100
37399
ab8e0abb7578 8145468: update java.lang APIs with new deprecations
smarks
parents: 37037
diff changeset
   101
java.desktop_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference \
37766
dc5728bbbb36 8155872: Temporarily disable deprecation checking on the java.desktop module
darcy
parents: 37656
diff changeset
   102
    '-Xdoclint/package:java.*,javax.*' -Xlint:-deprecation 
28903
2bf89d675e57 8056298: Separate java.awt.datatransfer from the desktop module
serb
parents: 27602
diff changeset
   103
java.desktop_COPY := .gif .png .wav .txt .xml .css .pf
29169
9a91cf20c223 8039269: images/cursors should not be in ${java.home}/lib
serb
parents: 28903
diff changeset
   104
java.desktop_CLEAN := iio-plugin.properties cursors.properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   105
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   106
java.desktop_EXCLUDES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   107
    java/awt/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   108
    javax/swing/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   109
    javax/swing/text/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   110
    javax/swing/plaf/synth/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   111
    javax/swing/undo/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   112
    sun/awt/X11/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   113
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   114
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   115
java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   116
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   117
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   118
    javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   119
    javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   120
    javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   121
    javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   122
    javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   123
    sun/awt/resources/security-icon-bw16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   124
    sun/awt/resources/security-icon-bw24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   125
    sun/awt/resources/security-icon-bw32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   126
    sun/awt/resources/security-icon-bw48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   127
    sun/awt/resources/security-icon-interim16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   128
    sun/awt/resources/security-icon-interim24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   129
    sun/awt/resources/security-icon-interim32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   130
    sun/awt/resources/security-icon-interim48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   131
    sun/awt/resources/security-icon-yellow16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   132
    sun/awt/resources/security-icon-yellow24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   133
    sun/awt/resources/security-icon-yellow32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   134
    sun/awt/resources/security-icon-yellow48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   135
    sun/awt/X11/java-icon16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   136
    sun/awt/X11/java-icon24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   137
    sun/awt/X11/java-icon32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   138
    sun/awt/X11/java-icon48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   139
    .template \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   140
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   141
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   142
ifeq ($(OPENJDK_TARGET_OS), macosx)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   143
  # exclude all X11 on Mac.
29671
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   144
  java.desktop_EXCLUDES += \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   145
      sun/awt/X11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   146
      sun/java2d/x11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   147
      sun/java2d/jules \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   148
      sun/java2d/xr \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   149
      com/sun/java/swing/plaf/gtk \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   150
      #
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   151
  java.desktop_EXCLUDE_FILES += \
29671
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   152
      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   153
      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   154
      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   155
      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   156
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   157
else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   158
  # TBD: figure out how to eliminate this long list
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   159
  java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   160
      sun/awt/X11/ScreenFormat.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   161
      sun/awt/X11/XArc.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   162
      sun/awt/X11/XChar2b.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   163
      sun/awt/X11/XCharStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   164
      sun/awt/X11/XClassHint.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   165
      sun/awt/X11/XComposeStatus.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   166
      sun/awt/X11/XExtCodes.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   167
      sun/awt/X11/XFontProp.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   168
      sun/awt/X11/XFontSetExtents.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   169
      sun/awt/X11/XFontStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   170
      sun/awt/X11/XGCValues.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   171
      sun/awt/X11/XHostAddress.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   172
      sun/awt/X11/XIMCallback.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   173
      sun/awt/X11/XIMHotKeyTrigger.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   174
      sun/awt/X11/XIMHotKeyTriggers.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   175
      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   176
      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   177
      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   178
      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   179
      sun/awt/X11/XIMStringConversionCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   180
      sun/awt/X11/XIMStringConversionText.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   181
      sun/awt/X11/XIMStyles.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   182
      sun/awt/X11/XIMText.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   183
      sun/awt/X11/XIMValuesList.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   184
      sun/awt/X11/XImage.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   185
      sun/awt/X11/XKeyboardControl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   186
      sun/awt/X11/XKeyboardState.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   187
      sun/awt/X11/XOMCharSetList.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   188
      sun/awt/X11/XOMFontInfo.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   189
      sun/awt/X11/XOMOrientation.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   190
      sun/awt/X11/XPoint.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   191
      sun/awt/X11/XRectangle.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   192
      sun/awt/X11/XSegment.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   193
      sun/awt/X11/XStandardColormap.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   194
      sun/awt/X11/XTextItem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   195
      sun/awt/X11/XTextItem16.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   196
      sun/awt/X11/XTextProperty.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   197
      sun/awt/X11/XTimeCoord.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   198
      sun/awt/X11/XWindowChanges.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   199
      sun/awt/X11/XdbeSwapInfo.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   200
      sun/awt/X11/XmbTextItem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   201
      sun/awt/X11/XwcTextItem.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   202
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   203
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   204
ifeq ($(OPENJDK_TARGET_OS), windows)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   205
  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   206
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   207
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   208
ifdef BUILD_HEADLESS_ONLY
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   209
  java.desktop_EXCLUDES += sun/applet
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   210
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   211
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   212
# Why is this in the open source tree?
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   213
ifdef OPENJDK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   214
  java.desktop_EXCLUDES += sun/dc
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   215
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   216
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   217
# Used on windows and macosx
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   218
ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   219
  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   220
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   221
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   222
# These files do not appear in the build result of the old build. This
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   223
# is because they are generated sources, but the AUTO_JAVA_FILES won't
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   224
# pick them up since they aren't generated when the source dirs are
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   225
# searched and they aren't referenced by any other classes so they won't
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   226
# be picked up by implicit compilation. On a rebuild, they are picked up
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   227
# and compiled. Exclude them here to produce the same rt.jar as the old
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   228
# build does when building just once.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   229
java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   230
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   231
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   232
    javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   233
    javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   234
    javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   235
    javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   236
    javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   237
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   238
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   239
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   240
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   241
java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   242
java.scripting_COPY := .js
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   243
java.scripting_CLEAN := .properties
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   244
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   245
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   246
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   247
java.instrument_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   248
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   249
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   250
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   251
java.logging_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   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
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   255
java.management_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   256
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   257
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   258
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   259
java.prefs_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   260
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   261
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   262
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   263
java.transaction_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   264
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   265
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   266
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   267
java.sql_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   268
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   269
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   270
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   271
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   272
java.sql.rowset_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   273
java.sql.rowset_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   274
    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   275
    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   276
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   277
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   278
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   279
java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   280
java.rmi_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   281
    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   282
    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
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
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   286
java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   287
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   288
java.corba_COPY := .prp
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   289
java.corba_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   290
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   291
java.corba_EXCLUDES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   292
    com/sun/corba/se/PortableActivationIDL \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   293
    com/sun/tools/corba/se/logutil \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   294
    #
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   295
java.corba_EXCLUDE_FILES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   296
    com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   297
    com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   298
    com/sun/org/omg/CORBA/IDLTypeOperations.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   299
    com/sun/org/omg/CORBA/IRObjectOperations.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   300
    org/omg/PortableInterceptor/UNKNOWN.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   301
    com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   302
    com/sun/corba/se/impl/presentation/rmi/jndi.properties \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   303
    #
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
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   307
java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   308
java.xml_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   309
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   310
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   311
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   312
java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   313
java.xml.bind_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   314
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   315
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   316
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   317
java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   318
java.xml.soap_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   319
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   320
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   321
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   322
java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   323
java.xml.ws_COPY := .xml
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   324
java.xml.ws_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   325
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   326
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   327
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   328
java.naming_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   329
java.naming_CLEAN := jndiprovider.properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   330
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   331
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   332
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   333
java.security.saaj_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   334
java.security.saaj_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   335
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   336
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   337
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   338
java.security.jgss_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   339
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   340
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   341
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   342
java.smartcardio_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   343
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   344
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   345
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   346
java.xml.crypto_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   347
java.xml.crypto_COPY := .dtd .xml
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   348
java.xml.crypto_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   349
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   350
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   351
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   352
jdk.charsets_COPY := .dat
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   353
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   354
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   355
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   356
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   357
    -XDstringConcat=inline
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   358
jdk.compiler_CLEAN_FILES := $(wildcard \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   359
    $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   360
        sun/tools/serialver/resources))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   361
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   362
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   363
34116
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   364
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
36290
68b6b8f114b6 8150723: HSDB toolbar icons are missing.
ysuenaga
parents: 35442
diff changeset
   365
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
   366
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   367
################################################################################
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   368
31512
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   369
jdk.internal.le_COPY := .properties
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   370
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   371
################################################################################
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   372
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27586
diff changeset
   373
jdk.jcmd_COPY := _options
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   374
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   375
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   376
34099
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   377
jdk.dynalink_CLEAN := .properties
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   378
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   379
################################################################################
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   380
33723
b09ccef0313a 8142367: Allow files with .png extension to be copied for javadoc
bpatel
parents: 33045
diff changeset
   381
jdk.javadoc_COPY := .xml .css .js .png
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   382
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   383
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   384
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   385
jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   386
jdk.rmic_CLEAN := .properties
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
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   390
# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   391
SCTP_IMPL_CLASSES = \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   392
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   393
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   394
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   395
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   396
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   397
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   398
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   399
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   400
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   401
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   402
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   403
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   404
ifeq ($(OPENJDK_TARGET_OS), macosx)
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   405
  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   406
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   407
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   408
ifeq ($(OPENJDK_TARGET_OS),aix)
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   409
  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   410
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   411
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   412
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   413
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   414
jdk.jconsole_COPY := .gif .png
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   415
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   416
jdk.jconsole_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   417
    $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
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
30742
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   421
jdk.jdeps_CLEAN_FILES := $(wildcard \
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   422
    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   423
    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   424
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   425
################################################################################
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   426
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   427
jdk.jdi_EXCLUDES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   428
    com/sun/tools/example/debug/bdi \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   429
    com/sun/tools/example/debug/event \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   430
    com/sun/tools/example/debug/gui \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   431
    com/sun/jdi/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   432
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   433
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   434
jdk.jdi_EXCLUDE_FILES += jdi-overview.html
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   435
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   436
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   437
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   438
jdk.dev_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   439
    $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   440
        com/sun/tools/script/shell))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   441
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   442
jdk.dev_COPY := .js oqlhelp.html .txt
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   443
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   444
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   445
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   446
jdk.jvmstat_COPY := aliasmap
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   447
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   448
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   449
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   450
jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   451
jdk.xml.bind_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   452
jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   453
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   454
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   455
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   456
jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   457
jdk.xml.ws_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   458
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   459
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   460
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   461
sun.charsets_COPY := .dat
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   462
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   463
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   464
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   465
jdk.localedata_COPY := _dict _th
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   466
# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   467
# data files and shouldn't go in the product
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   468
jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   469
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   470
################################################################################
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   471
# Setup the compilation for the module
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   472
#
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   473
MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   474
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   475
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   476
# 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
   477
# be recompiled. If multiple paths are separated by comma, convert that into a
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   478
# space separated list.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   479
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   480
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   481
# Get the complete module source path.
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   482
MODULESOURCEPATH := $(call GetModuleSrcPath)
31014
a3b1e5a584bd 8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents: 30742
diff changeset
   483
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   484
# Add imported modules to the modulepath
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   485
MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   486
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   487
ifeq ($(MODULE), jdk.vm.ci)
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   488
  ## WORKAROUND jdk.vm.ci source structure issue
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   489
  JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   490
      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   491
          $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   492
  MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   493
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   494
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   495
$(eval $(call SetupJavaCompilation, $(MODULE), \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   496
    SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   497
    MODULE := $(MODULE), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   498
    SRC := $(wildcard $(MODULE_SRC_DIRS)), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   499
    INCLUDES := $(JDK_USER_DEFINED_FILTER),\
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   500
    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   501
    HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   502
    ADD_JAVAC_FLAGS := \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   503
        $($(MODULE)_ADD_JAVAC_FLAGS) \
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   504
        -modulesourcepath $(MODULESOURCEPATH) \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36787
diff changeset
   505
        -modulepath $(MODULEPATH) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   506
        -system none, \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   507
))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   508
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   509
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   510
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   511
# 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
   512
# 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
   513
# 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
   514
# 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
   515
# dependency declaration to that by using the *_COMPILE_TARGET variable.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   516
$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   517
    $(call SetupJavaCompilationCompileTarget, $d, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   518
        $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   519
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   520
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   521
# Copy zh_HK properties files from zh_TW
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   522
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   523
$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   524
	$(install-file)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   525
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   526
CreateHkTargets = \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   527
    $(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   528
      $(subst /share/classes,, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   529
        $(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
   530
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   531
ifeq ($(MODULE), java.sql.rowset)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   532
  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
   533
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   534
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   535
ifeq ($(MODULE), java.rmi)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   536
  TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   537
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   538
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   539
################################################################################
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   540
# If this is an imported module, copy the pre built classes and resources into
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   541
# the modules output dir
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   542
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   543
ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   544
  $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   545
      $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
37037
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents: 37030
diff changeset
   546
	$(call MakeDir, $(@D))
4fbd14764fa7 8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents: 37030
diff changeset
   547
        # 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
   548
	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   549
	$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   550
	$(TOUCH) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   551
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   552
  TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   553
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   554
  # Add this dependency to avoid a race between compiling module-info.java and
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   555
  # importing the classes.
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   556
  $($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   557
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   558
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   559
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   560
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   561
$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   562
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   563
################################################################################
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   564
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   565
all: $(TARGETS)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   566
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   567
.PHONY: all