make/CompileJavaModules.gmk
author alanb
Thu, 17 Mar 2016 19:03:53 +0000
changeset 36506 17612cee3530
parent 36290 68b6b8f114b6
child 36787 402e5e40f6e5
permissions -rw-r--r--
8142968: Module System implementation Summary: Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282 Reviewed-by: alanb, mchung, tbell Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, erik.joelsson@oracle.com, chris.hegarty@oracle.com, christian.tornqvist@oracle.com, harold.seigel@oracle.com, igor.ignatyev@oracle.com, james.laskey@oracle.com, jean-francois.denise@oracle.com, sundararajan.athijegannathan@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     1
#
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
     2
# Copyright (c) 2014, 2015, 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
30426
3595be2840ac 8075771: Enable "missing" doclint check in build of the java.desktop module
darcy
parents: 30425
diff changeset
   101
java.desktop_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
   102
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
   103
java.desktop_CLEAN := iio-plugin.properties cursors.properties
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   104
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   105
java.desktop_EXCLUDES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   106
    java/awt/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   107
    javax/swing/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   108
    javax/swing/text/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   109
    javax/swing/plaf/synth/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   110
    javax/swing/undo/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   111
    sun/awt/X11/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   112
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   113
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   114
# The exception handling of swing beaninfo
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   115
# These resources violates the convention of having code and resources together under
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   116
# $(JDK_TOPDIR)/src/.../classes directories
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   117
$(eval $(call SetupCopyFiles,COPY_BEANINFO, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   118
    SRC := $(JDK_TOPDIR)/make/data/swingbeaninfo/images, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   119
    DEST := $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/beaninfo/images, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   120
    FILES := $(wildcard $(JDK_TOPDIR)/make/data/swingbeaninfo/images/*.gif)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   121
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   122
java.desktop_COPY_EXTRA += $(COPY_BEANINFO)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   123
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   124
java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   125
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   126
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   127
    javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   128
    javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   129
    javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   130
    javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   131
    javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   132
    sun/awt/resources/security-icon-bw16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   133
    sun/awt/resources/security-icon-bw24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   134
    sun/awt/resources/security-icon-bw32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   135
    sun/awt/resources/security-icon-bw48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   136
    sun/awt/resources/security-icon-interim16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   137
    sun/awt/resources/security-icon-interim24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   138
    sun/awt/resources/security-icon-interim32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   139
    sun/awt/resources/security-icon-interim48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   140
    sun/awt/resources/security-icon-yellow16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   141
    sun/awt/resources/security-icon-yellow24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   142
    sun/awt/resources/security-icon-yellow32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   143
    sun/awt/resources/security-icon-yellow48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   144
    sun/awt/X11/java-icon16.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   145
    sun/awt/X11/java-icon24.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   146
    sun/awt/X11/java-icon32.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   147
    sun/awt/X11/java-icon48.png \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   148
    .template \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   149
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   150
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   151
ifeq ($(OPENJDK_TARGET_OS), macosx)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   152
  # exclude all X11 on Mac.
29671
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   153
  java.desktop_EXCLUDES += \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   154
      sun/awt/X11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   155
      sun/java2d/x11 \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   156
      sun/java2d/jules \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   157
      sun/java2d/xr \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   158
      com/sun/java/swing/plaf/gtk \
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   159
      #
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   160
  java.desktop_EXCLUDE_FILES += \
29671
2f05f44dfe01 8075277: JDK is still building X11 related Java files on OSX
prr
parents: 29169
diff changeset
   161
      $(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
   162
      $(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
   163
      $(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
   164
      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   165
      #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   166
else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   167
  # TBD: figure out how to eliminate this long list
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   168
  java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   169
      sun/awt/X11/ScreenFormat.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   170
      sun/awt/X11/XArc.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   171
      sun/awt/X11/XChar2b.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   172
      sun/awt/X11/XCharStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   173
      sun/awt/X11/XClassHint.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   174
      sun/awt/X11/XComposeStatus.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   175
      sun/awt/X11/XExtCodes.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   176
      sun/awt/X11/XFontProp.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   177
      sun/awt/X11/XFontSetExtents.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   178
      sun/awt/X11/XFontStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   179
      sun/awt/X11/XGCValues.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   180
      sun/awt/X11/XHostAddress.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   181
      sun/awt/X11/XIMCallback.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   182
      sun/awt/X11/XIMHotKeyTrigger.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   183
      sun/awt/X11/XIMHotKeyTriggers.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   184
      sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   185
      sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   186
      sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   187
      sun/awt/X11/XIMStatusDrawCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   188
      sun/awt/X11/XIMStringConversionCallbackStruct.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   189
      sun/awt/X11/XIMStringConversionText.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   190
      sun/awt/X11/XIMStyles.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   191
      sun/awt/X11/XIMText.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   192
      sun/awt/X11/XIMValuesList.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   193
      sun/awt/X11/XImage.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   194
      sun/awt/X11/XKeyboardControl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   195
      sun/awt/X11/XKeyboardState.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   196
      sun/awt/X11/XOMCharSetList.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   197
      sun/awt/X11/XOMFontInfo.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   198
      sun/awt/X11/XOMOrientation.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   199
      sun/awt/X11/XPoint.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   200
      sun/awt/X11/XRectangle.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   201
      sun/awt/X11/XSegment.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   202
      sun/awt/X11/XStandardColormap.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   203
      sun/awt/X11/XTextItem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   204
      sun/awt/X11/XTextItem16.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   205
      sun/awt/X11/XTextProperty.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   206
      sun/awt/X11/XTimeCoord.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   207
      sun/awt/X11/XWindowChanges.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   208
      sun/awt/X11/XdbeSwapInfo.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   209
      sun/awt/X11/XmbTextItem.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   210
      sun/awt/X11/XwcTextItem.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   211
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   212
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   213
ifeq ($(OPENJDK_TARGET_OS), windows)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   214
  java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
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
ifdef BUILD_HEADLESS_ONLY
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   218
  java.desktop_EXCLUDES += sun/applet
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   219
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   220
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   221
# Why is this in the open source tree?
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   222
ifdef OPENJDK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   223
  java.desktop_EXCLUDES += sun/dc
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   224
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   225
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   226
# Used on windows and macosx
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   227
ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   228
  java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   229
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   230
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   231
# These files do not appear in the build result of the old build. This
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   232
# is because they are generated sources, but the AUTO_JAVA_FILES won't
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   233
# pick them up since they aren't generated when the source dirs are
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   234
# searched and they aren't referenced by any other classes so they won't
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   235
# be picked up by implicit compilation. On a rebuild, they are picked up
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   236
# and compiled. Exclude them here to produce the same rt.jar as the old
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   237
# build does when building just once.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   238
java.desktop_EXCLUDE_FILES += \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   239
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   240
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   241
    javax/swing/plaf/nimbus/ScrollBarPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   242
    javax/swing/plaf/nimbus/SliderPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   243
    javax/swing/plaf/nimbus/SpinnerPainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   244
    javax/swing/plaf/nimbus/SplitPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   245
    javax/swing/plaf/nimbus/TabbedPanePainter.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   246
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   247
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   248
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   249
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   250
java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   251
java.scripting_COPY := .js
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   252
java.scripting_CLEAN := .properties
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   253
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   254
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   255
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   256
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
   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
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   260
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
   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
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   264
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
   265
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   266
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   267
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   268
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
   269
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   270
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   271
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   272
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
   273
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   274
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   275
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   276
java.sql_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   277
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
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
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   281
java.sql.rowset_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   282
java.sql.rowset_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   283
    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   284
    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   285
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   286
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   287
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   288
java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   289
java.rmi_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   290
    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   291
    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   292
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   293
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   294
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   295
java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   296
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   297
java.corba_COPY := .prp
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   298
java.corba_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   299
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   300
java.corba_EXCLUDES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   301
    com/sun/corba/se/PortableActivationIDL \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   302
    com/sun/tools/corba/se/logutil \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   303
    #
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   304
java.corba_EXCLUDE_FILES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   305
    com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   306
    com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   307
    com/sun/org/omg/CORBA/IDLTypeOperations.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   308
    com/sun/org/omg/CORBA/IRObjectOperations.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   309
    org/omg/PortableInterceptor/UNKNOWN.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   310
    com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   311
    com/sun/corba/se/impl/presentation/rmi/jndi.properties \
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
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   315
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   316
java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   317
java.xml_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   318
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
java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   322
java.xml.bind_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   323
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   324
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   325
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   326
java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   327
java.xml.soap_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   328
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   329
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   330
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   331
java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   332
java.xml.ws_COPY := .xml
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   333
java.xml.ws_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   334
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   335
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   336
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   337
java.naming_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   338
java.naming_CLEAN := jndiprovider.properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   339
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   340
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   341
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   342
java.security.saaj_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   343
java.security.saaj_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   344
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   345
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   346
29863
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   347
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
   348
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   349
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   350
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   351
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
   352
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   353
################################################################################
403c1f8ca4a4 8077912: Turn on doclint checking for more modules
darcy
parents: 29672
diff changeset
   354
29313
36f48966bc7a 8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents: 29169
diff changeset
   355
java.xml.crypto_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   356
java.xml.crypto_COPY := .dtd .xml
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   357
java.xml.crypto_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   358
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   359
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   360
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   361
jdk.charsets_COPY := .dat
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   362
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   363
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   364
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   365
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   366
    -XDstringConcat=inline
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   367
jdk.compiler_CLEAN_FILES := $(wildcard \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   368
    $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27397
diff changeset
   369
        sun/tools/serialver/resources))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   370
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   371
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   372
34116
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   373
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
36290
68b6b8f114b6 8150723: HSDB toolbar icons are missing.
ysuenaga
parents: 35442
diff changeset
   374
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
   375
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   376
################################################################################
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33723
diff changeset
   377
31512
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   378
jdk.internal.le_COPY := .properties
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   379
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   380
################################################################################
756e4c77cd2d 8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents: 31310
diff changeset
   381
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27586
diff changeset
   382
jdk.jcmd_COPY := _options
25854
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
34099
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   386
jdk.dynalink_CLEAN := .properties
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   387
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   388
################################################################################
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33723
diff changeset
   389
33723
b09ccef0313a 8142367: Allow files with .png extension to be copied for javadoc
bpatel
parents: 33045
diff changeset
   390
jdk.javadoc_COPY := .xml .css .js .png
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   391
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   392
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   393
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   394
jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   395
jdk.rmic_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   396
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   397
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   398
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   399
# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   400
SCTP_IMPL_CLASSES = \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   401
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   402
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   403
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   404
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   405
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   406
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   407
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   408
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   409
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   410
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   411
    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   412
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   413
ifeq ($(OPENJDK_TARGET_OS), macosx)
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   414
  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   415
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   416
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   417
ifeq ($(OPENJDK_TARGET_OS),aix)
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   418
  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   419
endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   420
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   421
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   422
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   423
jdk.jconsole_COPY := .gif .png
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   424
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   425
jdk.jconsole_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   426
    $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   427
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   428
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   429
30742
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   430
jdk.jdeps_CLEAN_FILES := $(wildcard \
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   431
    $(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
   432
    $(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
   433
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   434
################################################################################
679fecf08dd2 8074432: Move jdeps and javap to jdk.jdeps module
mchung
parents: 30426
diff changeset
   435
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   436
jdk.jdi_EXCLUDES += \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   437
    com/sun/tools/example/debug/bdi \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   438
    com/sun/tools/example/debug/event \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   439
    com/sun/tools/example/debug/gui \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   440
    com/sun/jdi/doc-files \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   441
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   442
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   443
jdk.jdi_EXCLUDE_FILES += jdi-overview.html
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   444
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   445
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   446
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   447
jdk.dev_CLEAN_FILES := $(wildcard \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   448
    $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   449
        com/sun/tools/script/shell))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   450
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   451
jdk.dev_COPY := .js oqlhelp.html .txt
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   452
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
jdk.jvmstat_COPY := aliasmap
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   456
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   457
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   458
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   459
jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   460
jdk.xml.bind_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   461
jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
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.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   466
jdk.xml.ws_CLEAN := .properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   467
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   468
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   469
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   470
sun.charsets_COPY := .dat
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   471
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   472
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   473
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   474
jdk.localedata_COPY := _dict _th
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   475
# Exclude BreakIterator classes that are just used in compile process to generate
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   476
# data files and shouldn't go in the product
27397
25afb1340d37 8064372: CompileJavaModules overwrites settings from custom
rriggs
parents: 27240
diff changeset
   477
jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   478
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   479
################################################################################
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   480
# Setup the compilation for the module
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   481
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   482
# Order src dirs in order of override with the most important first. Generated
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   483
# source before static source and platform specific source before shared.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   484
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   485
GENERATED_SRC_DIRS += \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   486
    $(SUPPORT_OUTPUTDIR)/gensrc \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   487
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   488
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   489
TOP_SRC_DIRS += \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   490
    $(HOTSPOT_TOPDIR)/src \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   491
    $(CORBA_TOPDIR)/src \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   492
    $(JDK_TOPDIR)/src \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   493
    $(LANGTOOLS_TOPDIR)/src \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   494
    $(JAXP_TOPDIR)/src \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   495
    $(JAXWS_TOPDIR)/src \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   496
    $(NASHORN_TOPDIR)/src \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   497
    #
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   498
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   499
SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   500
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   501
  SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   502
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   503
SRC_SUBDIRS += share/classes
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   504
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   505
MODULE_SRC_DIRS := $(strip \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   506
    $(addsuffix /$(MODULE), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   507
    $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(MODULE)/$(sub), $(TOP_SRC_DIRS))))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   508
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   509
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   510
# 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
   511
# be recompiled. If multiple paths are separated by comma, convert that into a
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   512
# space separated list.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   513
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   514
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   515
# Rewrite the MODULE_SRC_DIRS with a wildcard for the module so that all module
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   516
# source dirs are available on the path.
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   517
MODULESOURCEPATH := $(subst $(SPACE),$(PATH_SEP),$(subst $(MODULE),*,$(MODULE_SRC_DIRS)))
31014
a3b1e5a584bd 8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents: 30742
diff changeset
   518
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   519
# Add imported modules to the moduleclasspath
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   520
MODULECLASSPATH := $(subst $(SPACE),$(PATH_SEP), $(IMPORT_MODULES_CLASSES))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   521
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   522
ifeq ($(MODULE), jdk.vm.ci)
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   523
  ## WORKAROUND jdk.vm.ci source structure issue
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   524
  JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   525
      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   526
          $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   527
  MODULESOURCEPATH := $(subst $(SPACE),$(PATH_SEP), $(JVMCI_MODULESOURCEPATH))
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   528
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   529
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   530
# Make sure the generated source base dirs exist. Not all modules have generated
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   531
# source in all of these directories and because of timing, all of them might not
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   532
# exist at the time this makefile gets called. Javac will complain if there are
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   533
# missing directories in the moduleclasspath.
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   534
$(call MakeDir, $(GENERATED_SRC_DIRS))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   535
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   536
$(eval $(call SetupJavaCompilation, $(MODULE), \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   537
    SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   538
    MODULE := $(MODULE), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   539
    SRC := $(wildcard $(MODULE_SRC_DIRS)), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   540
    INCLUDES := $(JDK_USER_DEFINED_FILTER),\
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   541
    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   542
    HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   543
    ADD_JAVAC_FLAGS := \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   544
        $($(MODULE)_ADD_JAVAC_FLAGS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   545
        -modulesourcepath "$(MODULESOURCEPATH)" \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   546
        $(if $(MODULECLASSPATH), -modulepath "$(MODULECLASSPATH)") \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   547
        -system none, \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   548
))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   549
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   550
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   551
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   552
# 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
   553
# 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
   554
# 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
   555
# 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
   556
# dependency declaration to that by using the *_COMPILE_TARGET variable.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   557
$($(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
   558
    $(call SetupJavaCompilationCompileTarget, $d, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   559
        $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   560
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   561
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   562
# Copy zh_HK properties files from zh_TW
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   563
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   564
$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   565
	$(install-file)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   566
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   567
CreateHkTargets = \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   568
    $(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   569
      $(subst /share/classes,, \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   570
        $(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
   571
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   572
ifeq ($(MODULE), java.sql.rowset)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   573
  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
   574
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   575
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   576
ifeq ($(MODULE), java.rmi)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   577
  TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES))
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   578
endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
   579
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   580
################################################################################
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   581
# If this is an imported module, copy the pre built classes and resources into
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   582
# the modules output dir
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   583
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   584
ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   585
  $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   586
      $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   587
	$(RM) -r $(@D)
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   588
	$(MKDIR) -p $(@D)
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   589
	$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   590
	$(TOUCH) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   591
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   592
  TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   593
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   594
  # Add this dependency to avoid a race between compiling module-info.java and
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   595
  # importing the classes.
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   596
  $($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   597
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   598
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   599
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   600
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   601
$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   602
17612cee3530 8142968: Module System implementation
alanb
parents: 36290
diff changeset
   603
################################################################################
25854
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
all: $(TARGETS)
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   606
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 34099
diff changeset
   607
.PHONY: all