make/common/Modules.gmk
author chegar
Wed, 07 Feb 2018 14:17:24 +0000
branchhttp-client-branch
changeset 56089 42208b2f224e
parent 47853 3e345eba9255
child 56097 15dc43936d39
permissions -rw-r--r--
http-client-branch: move to standard package and module name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     1
#
43176
1da1ffe0c6fd 8172527: Rename jdk.crypto.token to jdk.crypto.cryptoki
ascarpino
parents: 42534
diff changeset
     2
# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     4
#
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    10
#
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    15
# accompanied this code).
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    16
#
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    20
#
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    23
# questions.
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    24
#
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    25
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    26
ifndef _MODULES_GMK
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    27
_MODULES_GMK := 1
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
    28
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    29
################################################################################
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    30
#
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    31
# BOOT_MODULES are modules defined by the boot loader
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    32
# PLATFORM_MODULES are modules defined by the platform loader
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    33
# JRE_TOOL_MODULES are tools included in JRE and defined by the application loader
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    34
#
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    35
# All other modules not declared below are defined by the application loader
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    36
# and are not included in JRE.
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    37
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    38
BOOT_MODULES :=
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    39
PLATFORM_MODULES :=
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    40
JRE_TOOL_MODULES :=
37764
63e0379dd186 8154956: Module system implementation refresh (4/2016)
alanb
parents: 37030
diff changeset
    41
UPGRADEABLE_MODULES :=
63e0379dd186 8154956: Module system implementation refresh (4/2016)
alanb
parents: 37030
diff changeset
    42
AGGREGATOR_MODULES :=
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
    43
DOCS_MODULES :=
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    44
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
    45
# Hook to include the corresponding custom file, if present.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47267
diff changeset
    46
$(eval $(call IncludeCustomExtension, common/Modules.gmk))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
    47
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    48
BOOT_MODULES += \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    49
    java.base \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    50
    java.datatransfer \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    51
    java.desktop \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    52
    java.instrument \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    53
    java.logging \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    54
    java.management \
43384
0a0861e1db57 8173607: JMX RMI connector should be in its own module
dfuchs
parents: 43382
diff changeset
    55
    java.management.rmi \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    56
    java.naming \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    57
    java.prefs \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    58
    java.rmi \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    59
    java.security.sasl \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    60
    java.xml \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
    61
    jdk.internal.vm.ci \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    62
    jdk.management \
43382
8e0c4b44e4c0 8173608: Separate JDK management agent from java.management module
mchung
parents: 43287
diff changeset
    63
    jdk.management.agent \
37650
ef6c24163cb2 8044773: Refactor jdk.net API so that it can be moved out of the base module
chegar
parents: 37030
diff changeset
    64
    jdk.net \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    65
    jdk.sctp \
36793
8b116f192318 8153737: Unsupported Module
chegar
parents: 36790
diff changeset
    66
    jdk.unsupported \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    67
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    68
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    69
# to be deprivileged
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    70
BOOT_MODULES += \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    71
    jdk.naming.rmi \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    72
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    73
45612
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
    74
# Modules that directly or indirectly requiring upgradeable modules
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
    75
# should carefully be considered if it should be upgradeable or not.
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    76
UPGRADEABLE_MODULES += \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    77
    java.activation \
45612
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
    78
    java.compiler \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    79
    java.corba \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    80
    java.transaction \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    81
    java.xml.bind \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    82
    java.xml.ws \
43398
3cecfaef55fe 8173604: Rename module 8173604 java.annotations.common to java.xml.ws.annoations
lancea
parents: 43384
diff changeset
    83
    java.xml.ws.annotation \
44830
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 44733
diff changeset
    84
    jdk.internal.vm.compiler \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    85
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    86
45612
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
    87
UPGRADEABLE_TOOL_MODULES += \
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
    88
    jdk.xml.bind \
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
    89
    jdk.xml.ws \
44830
65c7a535e272 8177845: Need a mechanism to load Graal
dnsimon
parents: 44733
diff changeset
    90
    #
37975
551c5d86de79 8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents: 37973
diff changeset
    91
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    92
AGGREGATOR_MODULES += \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    93
    java.se \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    94
    java.se.ee \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    95
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    96
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    97
PLATFORM_MODULES += \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    98
    $(UPGRADEABLE_MODULES) \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    99
    $(AGGREGATOR_MODULES)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   100
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   101
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   102
PLATFORM_MODULES += \
56089
42208b2f224e http-client-branch: move to standard package and module name
chegar
parents: 47853
diff changeset
   103
    java.net.http \
37973
922326ad0c94 8154192: Deprivilege java.scripting module
sundar
parents: 37770
diff changeset
   104
    java.scripting \
39820
428c076d7ddf 8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents: 39817
diff changeset
   105
    java.security.jgss \
39612
00cf8f38916f 8161171: Missed the make/common/Modules.gmk file when integrating JDK-8154191
valeriep
parents: 38626
diff changeset
   106
    java.smartcardio \
38626
68d286c03952 8154189: Deprivilege java.sql and java.sql.rowset module
lancea
parents: 37975
diff changeset
   107
    java.sql \
68d286c03952 8154189: Deprivilege java.sql and java.sql.rowset module
lancea
parents: 37975
diff changeset
   108
    java.sql.rowset \
39817
2689bb7db9fc 8159488: Deprivilege java.xml.crypto
valeriep
parents: 39612
diff changeset
   109
    java.xml.crypto \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   110
    jdk.accessibility \
37769
96f9a38fb70e 8155513: Deprivilege jdk.charsets
mchung
parents: 37768
diff changeset
   111
    jdk.charsets \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   112
    jdk.crypto.cryptoki \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   113
    jdk.crypto.ec \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   114
    jdk.dynalink \
47267
b3a91921bafc 8159526: Deprivilege jdk.httpserver
vtewari
parents: 47224
diff changeset
   115
    jdk.httpserver \
47557
8b2054b7d02c 8182701: Modify JVMCI to allow Graal Compiler to expose platform MBean
jtulach
parents: 47224
diff changeset
   116
    jdk.internal.vm.compiler.management \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   117
    jdk.jsobject \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   118
    jdk.localedata \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   119
    jdk.naming.dns \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   120
    jdk.scripting.nashorn \
39820
428c076d7ddf 8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents: 39817
diff changeset
   121
    jdk.security.auth \
428c076d7ddf 8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents: 39817
diff changeset
   122
    jdk.security.jgss \
428c076d7ddf 8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents: 39817
diff changeset
   123
    jdk.xml.dom \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   124
    jdk.zipfs \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   125
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   126
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   127
ifeq ($(OPENJDK_TARGET_OS), windows)
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   128
  PLATFORM_MODULES += jdk.crypto.mscapi
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   129
endif
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   130
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   131
ifeq ($(OPENJDK_TARGET_OS), solaris)
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   132
  PLATFORM_MODULES += jdk.crypto.ucrypto
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   133
endif
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   134
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   135
JRE_TOOL_MODULES += \
36790
7191e0b1537e 8153660: jwdp.so/dll missing from JRE image
erikj
parents: 36725
diff changeset
   136
    jdk.jdwp.agent \
42514
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
   137
    jdk.pack \
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   138
    jdk.scripting.nashorn.shell \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   139
    #
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   140
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   141
################################################################################
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   142
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   143
# DOCS_MODULES defines the root modules for javadoc generation.
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   144
# All of their `require transitive` modules directly and indirectly will be included.
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   145
DOCS_MODULES += \
56089
42208b2f224e http-client-branch: move to standard package and module name
chegar
parents: 47853
diff changeset
   146
    java.net.http\
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   147
    java.se.ee \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   148
    java.smartcardio \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   149
    jdk.accessibility \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   150
    jdk.attach \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   151
    jdk.charsets \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   152
    jdk.compiler \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   153
    jdk.crypto.cryptoki \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   154
    jdk.crypto.ec \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   155
    jdk.dynalink \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   156
    jdk.editpad \
45232
1e2ad0809162 8175845: Provide javadoc descriptions for jdk.hotspot.agent module
uvangapally
parents: 45098
diff changeset
   157
    jdk.hotspot.agent \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   158
    jdk.httpserver \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   159
    jdk.jartool \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   160
    jdk.javadoc \
44730
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   161
    jdk.jcmd \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   162
    jdk.jconsole \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   163
    jdk.jdeps \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   164
    jdk.jdi \
44730
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   165
    jdk.jdwp.agent \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   166
    jdk.jlink \
44730
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   167
    jdk.jsobject \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   168
    jdk.jshell \
44730
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   169
    jdk.jstatd \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   170
    jdk.localedata \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   171
    jdk.management \
44730
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   172
    jdk.management.agent \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   173
    jdk.naming.dns \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   174
    jdk.naming.rmi \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   175
    jdk.net \
44730
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   176
    jdk.pack \
6b9ded7dc4ab 8179035: Include tool modules in unified docs
mchung
parents: 44726
diff changeset
   177
    jdk.rmic \
44725
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   178
    jdk.scripting.nashorn \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   179
    jdk.sctp \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   180
    jdk.security.auth \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   181
    jdk.security.jgss \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   182
    jdk.xml.dom \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   183
    jdk.zipfs \
8747b14eb49c 8172312: Update docs target and image for new combined docs
ihse
parents: 43925
diff changeset
   184
    #
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   185
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37769
diff changeset
   186
# These modules are included in the interim image which is used to run profiling
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37769
diff changeset
   187
# before building the real images.
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37769
diff changeset
   188
INTERIM_IMAGE_MODULES := java.base java.logging
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37769
diff changeset
   189
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   190
LANGTOOLS_MODULES := \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   191
    java.compiler \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   192
    jdk.compiler \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   193
    jdk.javadoc \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   194
    jdk.jdeps \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   195
    jdk.jshell \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   196
    #
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   197
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   198
CORBA_MODULES := java.corba
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   199
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   200
HOTSPOT_MODULES := \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   201
    jdk.aot \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   202
    jdk.hotspot.agent \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   203
    jdk.internal.vm.ci \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   204
    jdk.internal.vm.compiler \
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   205
    #
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   206
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   207
################################################################################
34116
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33045
diff changeset
   208
# Some platforms don't have the serviceability agent
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   209
34116
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33045
diff changeset
   210
ifeq ($(INCLUDE_SA), false)
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33045
diff changeset
   211
  MODULES_FILTER += jdk.hotspot.agent
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33045
diff changeset
   212
endif
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33045
diff changeset
   213
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33045
diff changeset
   214
################################################################################
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   215
# Filter out Graal specific modules if Graal build is disabled
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42289
diff changeset
   216
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42289
diff changeset
   217
ifeq ($(INCLUDE_GRAAL), false)
43925
3c0049f39b20 8174879: Rename jdk.vm.ci to jdk.internal.vm.ci
kvn
parents: 43663
diff changeset
   218
  MODULES_FILTER += jdk.internal.vm.compiler
47557
8b2054b7d02c 8182701: Modify JVMCI to allow Graal Compiler to expose platform MBean
jtulach
parents: 47224
diff changeset
   219
  MODULES_FILTER += jdk.internal.vm.compiler.management
42531
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42289
diff changeset
   220
endif
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42289
diff changeset
   221
37ee95196b17 8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents: 42289
diff changeset
   222
################################################################################
42532
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   223
# Filter out aot specific modules if aot is disabled
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   224
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   225
ifeq ($(ENABLE_AOT), false)
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   226
  MODULES_FILTER += jdk.aot
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   227
endif
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   228
4780f4130eb0 8171008: Integrate AOT compiler into JDK
kvn
parents: 42531
diff changeset
   229
################################################################################
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   230
# Module list macros
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   231
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   232
# Use append so that the custom extension may add to these variables
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   233
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   234
GENERATED_SRC_DIRS += \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   235
    $(SUPPORT_OUTPUTDIR)/gensrc \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   236
    #
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   237
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   238
TOP_SRC_DIRS += \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 45612
diff changeset
   239
    $(TOPDIR)/src \
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   240
    #
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   241
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   242
SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   243
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   244
  SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   245
endif
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   246
SRC_SUBDIRS += share/classes
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   247
44733
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   248
SPEC_SUBDIRS += share/specs
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   249
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   250
# Find all module-info.java files for the current build target platform and
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   251
# configuration.
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   252
# Param 1 - Module to find for, set to * for finding all
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   253
FindAllModuleInfos = \
47455
4c294a196030 8189376: Unsorted $(wildcard) causes instable module-deps.gmk
ihse
parents: 47314
diff changeset
   254
    $(sort $(wildcard \
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   255
        $(foreach sub, $(SRC_SUBDIRS), \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   256
          $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
47455
4c294a196030 8189376: Unsorted $(wildcard) causes instable module-deps.gmk
ihse
parents: 47314
diff changeset
   257
        $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC))))
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   258
41658
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   259
# Find module-info.java files in the specific source dir
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   260
# Param 1 - Src dir to find module-info.java files in
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   261
FindModuleInfosForSrcDir = \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   262
    $(wildcard \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   263
        $(foreach sub, $(SRC_SUBDIRS), \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   264
          $(patsubst %,%/*/$(sub)/module-info.java, $(strip $1)) \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   265
        ) \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   266
        $(patsubst %,%/*/module-info.java, $(strip $1)) \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   267
    )
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   268
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   269
# Extract the module names from the paths of module-info.java files. The
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   270
# position of the module directory differs depending on if this is an imported
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   271
# src dir or not.
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   272
GetModuleNameFromModuleInfo = \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   273
    $(strip $(foreach mi, $1, \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   274
      $(if $(filter $(addsuffix %, $(IMPORT_MODULES_SRC)), $(mi)), \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   275
        $(notdir $(patsubst %/,%, $(dir $(mi)))), \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   276
        $(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(mi)))))))))))
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   277
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   278
# Find all modules by looking for module-info.java files and looking at parent
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   279
# directories.
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   280
FindAllModules = \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   281
    $(sort $(filter-out $(MODULES_FILTER), \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   282
    $(call GetModuleNameFromModuleInfo, $(MODULE_INFOS))))
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   283
41658
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   284
# Find all modules in a specific src dir
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   285
# Param 1 - Src dir to find modules in
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   286
FindModulesForSrcDir = \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   287
    $(sort $(filter-out $(MODULES_FILTER), \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   288
        $(call GetModuleNameFromModuleInfo, $(call FindModuleInfosForSrcDir, $1)) \
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   289
    ))
14de1ab85d25 8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents: 41653
diff changeset
   290
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   291
FindImportedModules = \
37652
67e98335455c 8155629: MODULES_FILTER should apply to imported modules
erikj
parents: 37650
diff changeset
   292
    $(filter-out $(MODULES_FILTER), \
67e98335455c 8155629: MODULES_FILTER should apply to imported modules
erikj
parents: 37650
diff changeset
   293
    $(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*))))
26548
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26116
diff changeset
   294
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   295
# Find all source dirs for a particular module
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   296
# $1 - Module to find source dirs for
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   297
FindModuleSrcDirs = \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   298
    $(strip $(wildcard \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   299
        $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   300
        $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   301
44733
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   302
# Find all specs dirs for a particular module
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   303
# $1 - Module to find specs dirs for
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   304
FindModuleSpecsDirs = \
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   305
    $(strip $(wildcard \
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   306
        $(foreach sub, $(SPEC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
6505f00be6f2 8178038: Copy jdwp-protocol.html to proper location
ihse
parents: 44730
diff changeset
   307
37030
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   308
# Construct the complete module source path
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   309
GetModuleSrcPath = \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   310
    $(call PathList, \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   311
        $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   312
        $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))
e047c2f3f510 8153969: Clean up module src dir logic
erikj
parents: 36793
diff changeset
   313
26548
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26116
diff changeset
   314
################################################################################
45233
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   315
# Extract module dependencies from module-info.java files, both normal
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   316
# dependencies ("requires"), and indirect exports ("requires transitive").
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   317
26548
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26116
diff changeset
   318
MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   319
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   320
MODULE_INFOS := $(call FindAllModuleInfos, *)
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   321
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   322
$(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   323
    $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps)
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   324
	$(MKDIR) -p $(@D)
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   325
	$(RM) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   326
	$(foreach m, $(MODULE_INFOS), \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   327
	    ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   328
	      $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   329
	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
44726
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   330
	          /^ *requires/ { sub(/;/, ""); \
47853
3e345eba9255 8191420: Changing "requires" to "requires static" in an application module results in build failure
erikj
parents: 47735
diff changeset
   331
	                          sub(/requires /, " "); \
3e345eba9255 8191420: Changing "requires" to "requires static" in an application module results in build failure
erikj
parents: 47735
diff changeset
   332
	                          sub(/ static /, " "); \
3e345eba9255 8191420: Changing "requires" to "requires static" in an application module results in build failure
erikj
parents: 47735
diff changeset
   333
	                          sub(/ transitive /, " "); \
44726
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   334
	                          sub(/\/\/.*/, ""); \
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   335
	                          sub(/\/\*.*\*\//, ""); \
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   336
	                          gsub(/^ +\*.*/, ""); \
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   337
	                          gsub(/ /, ""); \
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   338
	                          printf(" %s", $$0) } \
45233
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   339
	          END           { printf("\n") }' $m && \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   340
	      $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   341
	      $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   342
	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   343
	          /^ *requires  *transitive/ { \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   344
	                          sub(/;/, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   345
	                          sub(/requires/, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   346
	                          sub(/transitive/, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   347
	                          sub(/\/\/.*/, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   348
	                          sub(/\/\*.*\*\//, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   349
	                          gsub(/^ +\*.*/, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   350
	                          gsub(/ /, ""); \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   351
	                          printf(" %s", $$0) } \
44726
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   352
	          END           { printf("\n") }' $m \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   353
	    ) >> $@ $(NEWLINE))
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   354
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   355
-include $(MODULE_DEPS_MAKEFILE)
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   356
45233
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   357
# Find dependencies ("requires") for a given module.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   358
# Param 1: Module to find dependencies for.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   359
FindDepsForModule = \
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   360
  $(DEPS_$(strip $1))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   361
45233
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   362
# Find dependencies ("requires") transitively in 3 levels for a given module.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   363
# Param 1: Module to find dependencies for.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   364
FindTransitiveDepsForModule = \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   365
    $(sort $(call FindDepsForModule, $1) \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   366
        $(foreach m, $(call FindDepsForModule, $1), \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   367
            $(call FindDepsForModule, $m) \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   368
            $(foreach n, $(call FindDepsForModule, $m), \
17612cee3530 8142968: Module System implementation
alanb
parents: 35030
diff changeset
   369
                 $(call FindDepsForModule, $n))))
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   370
45233
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   371
# Find dependencies ("requires") transitively in 3 levels for a set of modules.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   372
# Param 1: List of modules to find dependencies for.
44726
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   373
FindTransitiveDepsForModules = \
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   374
    $(sort $(foreach m, $1, $(call FindTransitiveDepsForModule, $m)))
04aa2c065f5c 8176785: Add build support to generate PNG file from .dot file
ihse
parents: 44725
diff changeset
   375
45233
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   376
# Find indirect exported modules ("requires transitive") for a given module .
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   377
# Param 1: Module to find indirect exported modules for.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   378
FindIndirectExportsForModule = \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   379
  $(TRANSITIVE_MODULES_$(strip $1))
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   380
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   381
# Finds indirect exported modules transitively in 3 levels for a given module.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   382
# Param 1: Module to find indirect exported modules for.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   383
FindTransitiveIndirectDepsForModule = \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   384
    $(sort $(call FindIndirectExportsForModule, $1) \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   385
        $(foreach m, $(call FindIndirectExportsForModule, $1), \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   386
            $(call FindIndirectExportsForModule, $m) \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   387
            $(foreach n, $(call FindIndirectExportsForModule, $m), \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   388
                 $(call FindIndirectExportsForModule, $n))))
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   389
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   390
# Finds indirect exported modules transitively in 3 levels for a set of modules.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   391
# Param 1: List of modules to find indirect exported modules for.
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   392
FindTransitiveIndirectDepsForModules = \
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   393
    $(sort $(foreach m, $1, $(call FindTransitiveIndirectDepsForModule, $m)))
538af025db97 8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents: 45232
diff changeset
   394
37975
551c5d86de79 8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents: 37973
diff changeset
   395
# Upgradeable modules are those that are either defined as upgradeable or that
551c5d86de79 8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents: 37973
diff changeset
   396
# require an upradeable module.
551c5d86de79 8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents: 37973
diff changeset
   397
FindAllUpgradeableModules = \
45612
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
   398
    $(sort $(filter-out $(MODULES_FILTER), $(UPGRADEABLE_MODULES) $(UPGRADEABLE_TOOL_MODULES)))
3368f6d8b082 8182032: Make java.compiler upgradeable
mchung
parents: 45509
diff changeset
   399
37975
551c5d86de79 8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents: 37973
diff changeset
   400
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   401
################################################################################
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   402
42505
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   403
LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS)/legal
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   404
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   405
  LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/legal
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   406
endif
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   407
LEGAL_SUBDIRS += share/legal
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   408
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   409
# Find all legal dirs for a particular module
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   410
# $1 - Module to find legal dirs for
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   411
FindModuleLegalDirs = \
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   412
    $(strip $(wildcard \
47735
45af799ceb6a 8190725: Freetype license file provided with configure not included in images
erikj
parents: 47701
diff changeset
   413
        $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \
45af799ceb6a 8190725: Freetype license file provided with configure not included in images
erikj
parents: 47701
diff changeset
   414
            $(IMPORT_MODULES_LEGAL)) \
45af799ceb6a 8190725: Freetype license file provided with configure not included in images
erikj
parents: 47701
diff changeset
   415
        $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
45af799ceb6a 8190725: Freetype license file provided with configure not included in images
erikj
parents: 47701
diff changeset
   416
    ))
42505
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   417
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   418
################################################################################
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42427
diff changeset
   419
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   420
# Param 1 - Name of module
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   421
define ReadSingleImportMetaData
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   422
    ifneq ($$(wildcard $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties), )
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   423
      classloader :=
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   424
      include_in_jre :=
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   425
      include_in_jdk :=
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   426
      include $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   427
      ifeq ($$(include_in_jre), true)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   428
        JRE_MODULES += $1
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   429
      endif
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   430
      ifeq ($$(include_in_jdk), true)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   431
        JDK_MODULES += $1
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   432
      endif
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   433
      ifeq ($$(classloader), boot)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   434
        BOOT_MODULES += $1
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   435
      else ifeq ($$(classloader), ext)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   436
        PLATFORM_MODULES += $1
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   437
      endif
45098
4f30865c93b0 8179105: Respect "include_in_docs" property from imported modules.
ihse
parents: 44830
diff changeset
   438
      ifneq ($$(include_in_docs), false)
4f30865c93b0 8179105: Respect "include_in_docs" property from imported modules.
ihse
parents: 44830
diff changeset
   439
        # defaults to true if unspecified
4f30865c93b0 8179105: Respect "include_in_docs" property from imported modules.
ihse
parents: 44830
diff changeset
   440
        DOCS_MODULES += $1
4f30865c93b0 8179105: Respect "include_in_docs" property from imported modules.
ihse
parents: 44830
diff changeset
   441
      endif
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   442
    else
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   443
      # Default to include in all
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   444
      JRE_MODULES += $1
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   445
      JDK_MODULES += $1
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   446
    endif
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   447
endef
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   448
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   449
# Reading the imported modules metadata has a cost, so to make it available,
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   450
# a makefile needs to eval-call this macro first. After calling this, the
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   451
# following variables are populated with data from the imported modules:
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   452
# * JRE_MODULES
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   453
# * JDK_MODULES
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   454
# * BOOT_MODULES
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   455
# * PLATFORM_MODULES
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   456
# * JRE_TOOL_MODULES
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   457
define ReadImportMetaData
36725
f458544b0d76 8153261: Clean up fix for JDK-8153217
erikj
parents: 36723
diff changeset
   458
    IMPORTED_MODULES := $$(call FindImportedModules)
f458544b0d76 8153261: Clean up fix for JDK-8153217
erikj
parents: 36723
diff changeset
   459
    $$(foreach m, $$(IMPORTED_MODULES), \
f458544b0d76 8153261: Clean up fix for JDK-8153217
erikj
parents: 36723
diff changeset
   460
      $$(eval $$(call ReadSingleImportMetaData, $$m)))
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   461
endef
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   462
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   463
################################################################################
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
   464
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff changeset
   465
endif # _MODULES_GMK