author | stefank |
Tue, 11 Apr 2017 23:45:37 +0200 | |
changeset 46565 | 8dcbf532ea00 |
parent 45509 | 9ebc9c6481dd |
child 45612 | 3368f6d8b082 |
permissions | -rw-r--r-- |
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 | 45 |
# Hook to include the corresponding custom file, if present. |
46 |
$(eval $(call IncludeCustomExtension, , common/Modules.gmk)) |
|
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 \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
61 |
jdk.httpserver \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
62 |
jdk.internal.vm.ci \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
63 |
jdk.management \ |
43382
8e0c4b44e4c0
8173608: Separate JDK management agent from java.management module
mchung
parents:
43287
diff
changeset
|
64 |
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
|
65 |
jdk.net \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
66 |
jdk.sctp \ |
36793 | 67 |
jdk.unsupported \ |
36543
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 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
70 |
# to be deprivileged |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
71 |
BOOT_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
72 |
jdk.naming.rmi \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
73 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
74 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
75 |
UPGRADEABLE_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
76 |
java.activation \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
77 |
java.corba \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
78 |
java.transaction \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
79 |
java.xml.bind \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
80 |
java.xml.ws \ |
43398
3cecfaef55fe
8173604: Rename module 8173604 java.annotations.common to java.xml.ws.annoations
lancea
parents:
43384
diff
changeset
|
81 |
java.xml.ws.annotation \ |
44830 | 82 |
jdk.internal.vm.compiler \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
83 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
84 |
|
37975
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
85 |
# Modules explicitly declared as not being upgradeable even though they require |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
86 |
# an upgradeable module. |
44830 | 87 |
NON_UPGRADEABLE_MODULES += \ |
88 |
jdk.aot \ |
|
89 |
# |
|
37975
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
90 |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
91 |
AGGREGATOR_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
92 |
java.se \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
93 |
java.se.ee \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
94 |
# |
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 |
PLATFORM_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
97 |
$(UPGRADEABLE_MODULES) \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
98 |
$(AGGREGATOR_MODULES) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
99 |
# |
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 |
PLATFORM_MODULES += \ |
37768 | 102 |
java.compiler \ |
37973 | 103 |
java.scripting \ |
39820
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
104 |
java.security.jgss \ |
39612
00cf8f38916f
8161171: Missed the make/common/Modules.gmk file when integrating JDK-8154191
valeriep
parents:
38626
diff
changeset
|
105 |
java.smartcardio \ |
38626
68d286c03952
8154189: Deprivilege java.sql and java.sql.rowset module
lancea
parents:
37975
diff
changeset
|
106 |
java.sql \ |
68d286c03952
8154189: Deprivilege java.sql and java.sql.rowset module
lancea
parents:
37975
diff
changeset
|
107 |
java.sql.rowset \ |
39817 | 108 |
java.xml.crypto \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
109 |
jdk.accessibility \ |
37769 | 110 |
jdk.charsets \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
111 |
jdk.crypto.cryptoki \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
112 |
jdk.crypto.ec \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
113 |
jdk.dynalink \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
114 |
jdk.incubator.httpclient \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
115 |
jdk.jsobject \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
116 |
jdk.localedata \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
117 |
jdk.naming.dns \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
118 |
jdk.scripting.nashorn \ |
39820
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
119 |
jdk.security.auth \ |
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
120 |
jdk.security.jgss \ |
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
121 |
jdk.xml.dom \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
122 |
jdk.zipfs \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
123 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
124 |
|
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
125 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
126 |
PLATFORM_MODULES += jdk.crypto.mscapi |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
127 |
endif |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
128 |
|
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
129 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
130 |
PLATFORM_MODULES += jdk.crypto.ucrypto |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
131 |
endif |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
132 |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
133 |
JRE_TOOL_MODULES += \ |
36790 | 134 |
jdk.jdwp.agent \ |
42514 | 135 |
jdk.pack \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
136 |
jdk.scripting.nashorn.shell \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
137 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
138 |
|
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
139 |
################################################################################ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
140 |
|
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
141 |
# 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
|
142 |
# 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
|
143 |
DOCS_MODULES += \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
144 |
java.se.ee \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
145 |
java.smartcardio \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
146 |
jdk.accessibility \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
147 |
jdk.attach \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
148 |
jdk.charsets \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
149 |
jdk.compiler \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
150 |
jdk.crypto.cryptoki \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
151 |
jdk.crypto.ec \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
152 |
jdk.dynalink \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
153 |
jdk.editpad \ |
45232
1e2ad0809162
8175845: Provide javadoc descriptions for jdk.hotspot.agent module
uvangapally
parents:
45098
diff
changeset
|
154 |
jdk.hotspot.agent \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
155 |
jdk.httpserver \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
156 |
jdk.incubator.httpclient \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
157 |
jdk.jartool \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
158 |
jdk.javadoc \ |
44730 | 159 |
jdk.jcmd \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
160 |
jdk.jconsole \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
161 |
jdk.jdeps \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
162 |
jdk.jdi \ |
44730 | 163 |
jdk.jdwp.agent \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
164 |
jdk.jlink \ |
44730 | 165 |
jdk.jsobject \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
166 |
jdk.jshell \ |
44730 | 167 |
jdk.jstatd \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
168 |
jdk.localedata \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
169 |
jdk.management \ |
44730 | 170 |
jdk.management.agent \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
171 |
jdk.naming.dns \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
172 |
jdk.naming.rmi \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
173 |
jdk.net \ |
44730 | 174 |
jdk.pack \ |
175 |
jdk.policytool \ |
|
176 |
jdk.rmic \ |
|
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
177 |
jdk.scripting.nashorn \ |
45509
9ebc9c6481dd
8181639: Add tool and services information to module summary
mchung
parents:
45233
diff
changeset
|
178 |
jdk.scripting.nashorn.shell \ |
44725
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 \ |
45509
9ebc9c6481dd
8181639: Add tool and services information to module summary
mchung
parents:
45233
diff
changeset
|
182 |
jdk.xml.bind \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
183 |
jdk.xml.dom \ |
45509
9ebc9c6481dd
8181639: Add tool and services information to module summary
mchung
parents:
45233
diff
changeset
|
184 |
jdk.xml.ws \ |
44725
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
185 |
jdk.zipfs \ |
8747b14eb49c
8172312: Update docs target and image for new combined docs
ihse
parents:
43925
diff
changeset
|
186 |
# |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
187 |
|
37770 | 188 |
# These modules are included in the interim image which is used to run profiling |
189 |
# before building the real images. |
|
190 |
INTERIM_IMAGE_MODULES := java.base java.logging |
|
191 |
||
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
192 |
################################################################################ |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
193 |
# 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
|
194 |
|
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
195 |
ifeq ($(INCLUDE_SA), false) |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
196 |
MODULES_FILTER += jdk.hotspot.agent |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
197 |
endif |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
198 |
|
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
199 |
################################################################################ |
42532 | 200 |
# 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
|
201 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
202 |
ifeq ($(INCLUDE_GRAAL), false) |
43925 | 203 |
MODULES_FILTER += jdk.internal.vm.compiler |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
204 |
endif |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
205 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
206 |
################################################################################ |
42532 | 207 |
# Filter out aot specific modules if aot is disabled |
208 |
||
209 |
ifeq ($(ENABLE_AOT), false) |
|
210 |
MODULES_FILTER += jdk.aot |
|
211 |
endif |
|
212 |
||
213 |
################################################################################ |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
214 |
# Module list macros |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
215 |
|
37030 | 216 |
# Use append so that the custom extension may add to these variables |
36506 | 217 |
|
37030 | 218 |
GENERATED_SRC_DIRS += \ |
219 |
$(SUPPORT_OUTPUTDIR)/gensrc \ |
|
220 |
# |
|
221 |
||
222 |
TOP_SRC_DIRS += \ |
|
223 |
$(CORBA_TOPDIR)/src \ |
|
33045
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
30095
diff
changeset
|
224 |
$(HOTSPOT_TOPDIR)/src \ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
225 |
$(JDK_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
226 |
$(LANGTOOLS_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
227 |
$(JAXP_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
228 |
$(JAXWS_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
229 |
$(NASHORN_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
230 |
# |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
231 |
|
37030 | 232 |
SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes |
233 |
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
|
234 |
SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes |
|
235 |
endif |
|
236 |
SRC_SUBDIRS += share/classes |
|
237 |
||
44733 | 238 |
SPEC_SUBDIRS += share/specs |
239 |
||
36506 | 240 |
# Find all module-info.java files for the current build target platform and |
241 |
# configuration. |
|
242 |
# Param 1 - Module to find for, set to * for finding all |
|
243 |
FindAllModuleInfos = \ |
|
244 |
$(wildcard \ |
|
37030 | 245 |
$(foreach sub, $(SRC_SUBDIRS), \ |
246 |
$(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \ |
|
43287
0ac98135a64b
8170483: Remove modules_src_jake workaround for JavaFX transition to new module-info syntax
erikj
parents:
43176
diff
changeset
|
247 |
$(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
|
248 |
|
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
249 |
# 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
|
250 |
# 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
|
251 |
FindModuleInfosForSrcDir = \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
252 |
$(wildcard \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
253 |
$(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
|
254 |
$(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
|
255 |
) \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
256 |
$(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
|
257 |
) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
258 |
|
36506 | 259 |
# Extract the module names from the paths of module-info.java files. The |
260 |
# position of the module directory differs depending on if this is an imported |
|
261 |
# src dir or not. |
|
262 |
GetModuleNameFromModuleInfo = \ |
|
263 |
$(strip $(foreach mi, $1, \ |
|
264 |
$(if $(filter $(addsuffix %, $(IMPORT_MODULES_SRC)), $(mi)), \ |
|
265 |
$(notdir $(patsubst %/,%, $(dir $(mi)))), \ |
|
266 |
$(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(mi))))))))))) |
|
267 |
||
268 |
# Find all modules by looking for module-info.java files and looking at parent |
|
269 |
# directories. |
|
270 |
FindAllModules = \ |
|
271 |
$(sort $(filter-out $(MODULES_FILTER), \ |
|
272 |
$(call GetModuleNameFromModuleInfo, $(MODULE_INFOS)))) |
|
273 |
||
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
274 |
# 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
|
275 |
# 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
|
276 |
FindModulesForSrcDir = \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
277 |
$(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
|
278 |
$(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
|
279 |
)) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
280 |
|
36506 | 281 |
FindImportedModules = \ |
37652
67e98335455c
8155629: MODULES_FILTER should apply to imported modules
erikj
parents:
37650
diff
changeset
|
282 |
$(filter-out $(MODULES_FILTER), \ |
67e98335455c
8155629: MODULES_FILTER should apply to imported modules
erikj
parents:
37650
diff
changeset
|
283 |
$(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*)))) |
26548 | 284 |
|
37030 | 285 |
# Find all source dirs for a particular module |
286 |
# $1 - Module to find source dirs for |
|
287 |
FindModuleSrcDirs = \ |
|
288 |
$(strip $(wildcard \ |
|
289 |
$(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
|
290 |
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
|
291 |
||
44733 | 292 |
# Find all specs dirs for a particular module |
293 |
# $1 - Module to find specs dirs for |
|
294 |
FindModuleSpecsDirs = \ |
|
295 |
$(strip $(wildcard \ |
|
296 |
$(foreach sub, $(SPEC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
|
297 |
||
37030 | 298 |
# Construct the complete module source path |
299 |
GetModuleSrcPath = \ |
|
300 |
$(call PathList, \ |
|
301 |
$(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
|
302 |
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS)))) |
|
303 |
||
26548 | 304 |
################################################################################ |
45233
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
305 |
# 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
|
306 |
# dependencies ("requires"), and indirect exports ("requires transitive"). |
36506 | 307 |
|
26548 | 308 |
MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk |
36506 | 309 |
|
310 |
MODULE_INFOS := $(call FindAllModuleInfos, *) |
|
311 |
||
312 |
$(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ |
|
313 |
$(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps) |
|
314 |
$(MKDIR) -p $(@D) |
|
315 |
$(RM) $@ |
|
316 |
$(foreach m, $(MODULE_INFOS), \ |
|
317 |
( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \ |
|
318 |
$(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\ |
|
319 |
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
|
320 |
/^ *requires/ { sub(/;/, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
321 |
sub(/requires/, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
322 |
sub(/transitive/, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
323 |
sub(/\/\/.*/, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
324 |
sub(/\/\*.*\*\//, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
325 |
gsub(/^ +\*.*/, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
326 |
gsub(/ /, ""); \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
327 |
printf(" %s", $$0) } \ |
45233
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
328 |
END { printf("\n") }' $m && \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
329 |
$(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
330 |
$(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
331 |
BEGIN { if (MODULE != "java.base") printf(" java.base"); } \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
332 |
/^ *requires *transitive/ { \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
333 |
sub(/;/, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
334 |
sub(/requires/, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
335 |
sub(/transitive/, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
336 |
sub(/\/\/.*/, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
337 |
sub(/\/\*.*\*\//, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
338 |
gsub(/^ +\*.*/, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
339 |
gsub(/ /, ""); \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
340 |
printf(" %s", $$0) } \ |
44726
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
341 |
END { printf("\n") }' $m \ |
36506 | 342 |
) >> $@ $(NEWLINE)) |
343 |
||
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
344 |
-include $(MODULE_DEPS_MAKEFILE) |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
345 |
|
45233
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
346 |
# Find dependencies ("requires") for a given module. |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
347 |
# Param 1: Module to find dependencies for. |
36506 | 348 |
FindDepsForModule = \ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
349 |
$(DEPS_$(strip $1)) |
36506 | 350 |
|
45233
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
351 |
# 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
|
352 |
# Param 1: Module to find dependencies for. |
36506 | 353 |
FindTransitiveDepsForModule = \ |
354 |
$(sort $(call FindDepsForModule, $1) \ |
|
355 |
$(foreach m, $(call FindDepsForModule, $1), \ |
|
356 |
$(call FindDepsForModule, $m) \ |
|
357 |
$(foreach n, $(call FindDepsForModule, $m), \ |
|
358 |
$(call FindDepsForModule, $n)))) |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
359 |
|
45233
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
360 |
# 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
|
361 |
# 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
|
362 |
FindTransitiveDepsForModules = \ |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
363 |
$(sort $(foreach m, $1, $(call FindTransitiveDepsForModule, $m))) |
04aa2c065f5c
8176785: Add build support to generate PNG file from .dot file
ihse
parents:
44725
diff
changeset
|
364 |
|
45233
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
365 |
# 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
|
366 |
# 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
|
367 |
FindIndirectExportsForModule = \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
368 |
$(TRANSITIVE_MODULES_$(strip $1)) |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
369 |
|
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
370 |
# 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
|
371 |
# 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
|
372 |
FindTransitiveIndirectDepsForModule = \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
373 |
$(sort $(call FindIndirectExportsForModule, $1) \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
374 |
$(foreach m, $(call FindIndirectExportsForModule, $1), \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
375 |
$(call FindIndirectExportsForModule, $m) \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
376 |
$(foreach n, $(call FindIndirectExportsForModule, $m), \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
377 |
$(call FindIndirectExportsForModule, $n)))) |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
378 |
|
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
379 |
# 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
|
380 |
# 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
|
381 |
FindTransitiveIndirectDepsForModules = \ |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
382 |
$(sort $(foreach m, $1, $(call FindTransitiveIndirectDepsForModule, $m))) |
538af025db97
8180480: Use "requires transitive" relationship when determining modules for javadoc
ihse
parents:
45232
diff
changeset
|
383 |
|
37975
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
384 |
# 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
|
385 |
# require an upradeable module. |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
386 |
FindAllUpgradeableModules = \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
387 |
$(filter-out $(MODULES_FILTER) $(NON_UPGRADEABLE_MODULES), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
388 |
$(sort $(UPGRADEABLE_MODULES) $(foreach m, \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
389 |
$(filter-out $(UPGRADEABLE_MODULES), $(call FindAllModules)), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
390 |
$(if $(filter $(UPGRADEABLE_MODULES), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
391 |
$(call FindTransitiveDepsForModule, $m)), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
392 |
$m \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
393 |
) \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
394 |
)) \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
395 |
) |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
396 |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
397 |
################################################################################ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
398 |
|
42505
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
399 |
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
|
400 |
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
|
401 |
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
|
402 |
endif |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
403 |
LEGAL_SUBDIRS += share/legal |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
404 |
|
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
405 |
# 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
|
406 |
# $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
|
407 |
FindModuleLegalDirs = \ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
408 |
$(strip $(wildcard \ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
409 |
$(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
410 |
$(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
411 |
|
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
412 |
################################################################################ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
413 |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
414 |
# Param 1 - Name of module |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
415 |
define ReadSingleImportMetaData |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
416 |
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
|
417 |
classloader := |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
418 |
include_in_jre := |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
419 |
include_in_jdk := |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
420 |
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
|
421 |
ifeq ($$(include_in_jre), true) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
422 |
JRE_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
423 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
424 |
ifeq ($$(include_in_jdk), true) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
425 |
JDK_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
426 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
427 |
ifeq ($$(classloader), boot) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
428 |
BOOT_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
429 |
else ifeq ($$(classloader), ext) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
430 |
PLATFORM_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
431 |
endif |
45098
4f30865c93b0
8179105: Respect "include_in_docs" property from imported modules.
ihse
parents:
44830
diff
changeset
|
432 |
ifneq ($$(include_in_docs), false) |
4f30865c93b0
8179105: Respect "include_in_docs" property from imported modules.
ihse
parents:
44830
diff
changeset
|
433 |
# defaults to true if unspecified |
4f30865c93b0
8179105: Respect "include_in_docs" property from imported modules.
ihse
parents:
44830
diff
changeset
|
434 |
DOCS_MODULES += $1 |
4f30865c93b0
8179105: Respect "include_in_docs" property from imported modules.
ihse
parents:
44830
diff
changeset
|
435 |
endif |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
436 |
else |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
437 |
# Default to include in all |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
438 |
JRE_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
439 |
JDK_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
440 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
441 |
endef |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
442 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
443 |
# 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
|
444 |
# 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
|
445 |
# 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
|
446 |
# * JRE_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
447 |
# * JDK_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
448 |
# * BOOT_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
449 |
# * PLATFORM_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
450 |
# * JRE_TOOL_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
451 |
define ReadImportMetaData |
36725 | 452 |
IMPORTED_MODULES := $$(call FindImportedModules) |
453 |
$$(foreach m, $$(IMPORTED_MODULES), \ |
|
454 |
$$(eval $$(call ReadSingleImportMetaData, $$m))) |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
455 |
endef |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
456 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
457 |
################################################################################ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
458 |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
459 |
endif # _MODULES_GMK |