author | erikj |
Fri, 27 Jan 2017 10:15:41 +0100 | |
changeset 43287 | 0ac98135a64b |
parent 43176 | 1da1ffe0c6fd |
child 43658 | 4abbeb6d852d |
child 43382 | 8e0c4b44e4c0 |
child 43661 | c3f1a529d829 |
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 := |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
43 |
|
36506 | 44 |
# Hook to include the corresponding custom file, if present. |
45 |
$(eval $(call IncludeCustomExtension, , common/Modules.gmk)) |
|
46 |
||
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
47 |
BOOT_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
48 |
java.base \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
49 |
java.datatransfer \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
50 |
java.desktop \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
51 |
java.instrument \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
52 |
java.logging \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
53 |
java.management \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
54 |
java.naming \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
55 |
java.prefs \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
56 |
java.rmi \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
57 |
java.security.sasl \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
58 |
java.xml \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
59 |
jdk.httpserver \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
60 |
jdk.management \ |
37650
ef6c24163cb2
8044773: Refactor jdk.net API so that it can be moved out of the base module
chegar
parents:
37030
diff
changeset
|
61 |
jdk.net \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
62 |
jdk.sctp \ |
36793 | 63 |
jdk.unsupported \ |
36545
91a564aa5e89
8152697: JVMCI tests fail with UnsatisfiedLinkError as jdk.vm.ci not defined by boot loader
mchung
parents:
36543
diff
changeset
|
64 |
jdk.vm.ci \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
65 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
66 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
67 |
# to be deprivileged |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
68 |
BOOT_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
69 |
jdk.naming.rmi \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
70 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
71 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
72 |
UPGRADEABLE_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
73 |
java.activation \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
74 |
java.annotations.common \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
75 |
java.corba \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
76 |
java.transaction \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
77 |
java.xml.bind \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
78 |
java.xml.ws \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
79 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
80 |
|
37975
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
81 |
# 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
|
82 |
# an upgradeable module. |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
83 |
NON_UPGRADEABLE_MODULES += |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
84 |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
85 |
AGGREGATOR_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
86 |
java.se \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
87 |
java.se.ee \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
88 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
89 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
90 |
PLATFORM_MODULES += \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
91 |
$(UPGRADEABLE_MODULES) \ |
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 |
# |
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 |
PLATFORM_MODULES += \ |
37768 | 96 |
java.compiler \ |
42427
2c48c5ffb581
8170648: Move java.net.http package out of Java SE to incubator namespace
michaelm
parents:
42289
diff
changeset
|
97 |
jdk.incubator.httpclient \ |
37973 | 98 |
java.scripting \ |
39820
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
99 |
java.security.jgss \ |
39612
00cf8f38916f
8161171: Missed the make/common/Modules.gmk file when integrating JDK-8154191
valeriep
parents:
38626
diff
changeset
|
100 |
java.smartcardio \ |
38626
68d286c03952
8154189: Deprivilege java.sql and java.sql.rowset module
lancea
parents:
37975
diff
changeset
|
101 |
java.sql \ |
68d286c03952
8154189: Deprivilege java.sql and java.sql.rowset module
lancea
parents:
37975
diff
changeset
|
102 |
java.sql.rowset \ |
39817 | 103 |
java.xml.crypto \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
104 |
jdk.accessibility \ |
37769 | 105 |
jdk.charsets \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
106 |
jdk.crypto.ec \ |
43176
1da1ffe0c6fd
8172527: Rename jdk.crypto.token to jdk.crypto.cryptoki
ascarpino
parents:
42534
diff
changeset
|
107 |
jdk.crypto.cryptoki \ |
41653
12ac83416f21
8167126: Create a module to provide access to non-SE desktop APIs
prr
parents:
40323
diff
changeset
|
108 |
jdk.desktop \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
109 |
jdk.dynalink \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
110 |
jdk.jsobject \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
111 |
jdk.localedata \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
112 |
jdk.naming.dns \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
113 |
jdk.scripting.nashorn \ |
39820
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
114 |
jdk.security.auth \ |
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
115 |
jdk.security.jgss \ |
428c076d7ddf
8159528: Deprivilege java.security.jgss, jdk.security.jgss and jdk.security.auth
weijun
parents:
39817
diff
changeset
|
116 |
jdk.xml.dom \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
117 |
jdk.zipfs \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
118 |
# |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
119 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
120 |
JRE_TOOL_MODULES += \ |
36790 | 121 |
jdk.jdwp.agent \ |
42514 | 122 |
jdk.pack \ |
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
123 |
jdk.scripting.nashorn.shell \ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
124 |
# |
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 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
127 |
PLATFORM_MODULES += jdk.crypto.mscapi |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
128 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
129 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
130 |
PLATFORM_MODULES += jdk.crypto.ucrypto |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
131 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
132 |
|
37770 | 133 |
# These modules are included in the interim image which is used to run profiling |
134 |
# before building the real images. |
|
135 |
INTERIM_IMAGE_MODULES := java.base java.logging |
|
136 |
||
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
137 |
################################################################################ |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
138 |
# 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
|
139 |
|
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
140 |
ifeq ($(INCLUDE_SA), false) |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
141 |
MODULES_FILTER += jdk.hotspot.agent |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
142 |
endif |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
143 |
|
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
144 |
################################################################################ |
42532 | 145 |
# 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
|
146 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
147 |
ifeq ($(INCLUDE_GRAAL), false) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
148 |
MODULES_FILTER += jdk.vm.compiler |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
149 |
endif |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
150 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42289
diff
changeset
|
151 |
################################################################################ |
42532 | 152 |
# Filter out aot specific modules if aot is disabled |
153 |
||
154 |
ifeq ($(ENABLE_AOT), false) |
|
155 |
MODULES_FILTER += jdk.aot |
|
156 |
endif |
|
157 |
||
158 |
################################################################################ |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
159 |
# Module list macros |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
160 |
|
37030 | 161 |
# Use append so that the custom extension may add to these variables |
36506 | 162 |
|
37030 | 163 |
GENERATED_SRC_DIRS += \ |
164 |
$(SUPPORT_OUTPUTDIR)/gensrc \ |
|
165 |
# |
|
166 |
||
167 |
TOP_SRC_DIRS += \ |
|
168 |
$(CORBA_TOPDIR)/src \ |
|
33045
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
30095
diff
changeset
|
169 |
$(HOTSPOT_TOPDIR)/src \ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
170 |
$(JDK_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
171 |
$(LANGTOOLS_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
172 |
$(JAXP_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
173 |
$(JAXWS_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
174 |
$(NASHORN_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
175 |
# |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
176 |
|
37030 | 177 |
SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes |
178 |
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
|
179 |
SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes |
|
180 |
endif |
|
181 |
SRC_SUBDIRS += share/classes |
|
182 |
||
36506 | 183 |
# Find all module-info.java files for the current build target platform and |
184 |
# configuration. |
|
185 |
# Param 1 - Module to find for, set to * for finding all |
|
186 |
FindAllModuleInfos = \ |
|
187 |
$(wildcard \ |
|
37030 | 188 |
$(foreach sub, $(SRC_SUBDIRS), \ |
189 |
$(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
|
190 |
$(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
|
191 |
|
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
192 |
# 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
|
193 |
# 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
|
194 |
FindModuleInfosForSrcDir = \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
195 |
$(wildcard \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
196 |
$(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
|
197 |
$(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
|
198 |
) \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
199 |
$(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
|
200 |
) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
201 |
|
36506 | 202 |
# Extract the module names from the paths of module-info.java files. The |
203 |
# position of the module directory differs depending on if this is an imported |
|
204 |
# src dir or not. |
|
205 |
GetModuleNameFromModuleInfo = \ |
|
206 |
$(strip $(foreach mi, $1, \ |
|
207 |
$(if $(filter $(addsuffix %, $(IMPORT_MODULES_SRC)), $(mi)), \ |
|
208 |
$(notdir $(patsubst %/,%, $(dir $(mi)))), \ |
|
209 |
$(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(mi))))))))))) |
|
210 |
||
211 |
# Find all modules by looking for module-info.java files and looking at parent |
|
212 |
# directories. |
|
213 |
FindAllModules = \ |
|
214 |
$(sort $(filter-out $(MODULES_FILTER), \ |
|
215 |
$(call GetModuleNameFromModuleInfo, $(MODULE_INFOS)))) |
|
216 |
||
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
217 |
# 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
|
218 |
# 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
|
219 |
FindModulesForSrcDir = \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
220 |
$(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
|
221 |
$(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
|
222 |
)) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41653
diff
changeset
|
223 |
|
36506 | 224 |
FindImportedModules = \ |
37652
67e98335455c
8155629: MODULES_FILTER should apply to imported modules
erikj
parents:
37650
diff
changeset
|
225 |
$(filter-out $(MODULES_FILTER), \ |
67e98335455c
8155629: MODULES_FILTER should apply to imported modules
erikj
parents:
37650
diff
changeset
|
226 |
$(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*)))) |
26548 | 227 |
|
37030 | 228 |
# Find all source dirs for a particular module |
229 |
# $1 - Module to find source dirs for |
|
230 |
FindModuleSrcDirs = \ |
|
231 |
$(strip $(wildcard \ |
|
232 |
$(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
|
233 |
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
|
234 |
||
235 |
# Construct the complete module source path |
|
236 |
GetModuleSrcPath = \ |
|
237 |
$(call PathList, \ |
|
238 |
$(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
|
239 |
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS)))) |
|
240 |
||
26548 | 241 |
################################################################################ |
36506 | 242 |
# Extract module dependencies from module-info.java files. |
243 |
||
26548 | 244 |
MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk |
36506 | 245 |
|
246 |
MODULE_INFOS := $(call FindAllModuleInfos, *) |
|
247 |
||
248 |
$(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ |
|
249 |
$(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps) |
|
250 |
$(MKDIR) -p $(@D) |
|
251 |
$(RM) $@ |
|
252 |
$(foreach m, $(MODULE_INFOS), \ |
|
253 |
( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \ |
|
254 |
$(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\ |
|
255 |
BEGIN { if (MODULE != "java.base") printf(" java.base"); } \ |
|
256 |
/requires/ { sub(/;/, ""); \ |
|
257 |
sub(/requires/, ""); \ |
|
42289
08548fd6e608
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41658
diff
changeset
|
258 |
sub(/transitive/, ""); \ |
36506 | 259 |
sub(/\/\/.*/, ""); \ |
260 |
sub(/\/\*.*\*\//, ""); \ |
|
40323
d9e56c574af6
8164402: key word 'requires' appearing in comment causing a build failure
tbell
parents:
39820
diff
changeset
|
261 |
gsub(/^ +\*.*/, ""); \ |
36506 | 262 |
gsub(/ /, ""); \ |
263 |
printf(" %s", $$0) } \ |
|
264 |
END { printf("\n") }' $m \ |
|
265 |
) >> $@ $(NEWLINE)) |
|
266 |
||
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
267 |
-include $(MODULE_DEPS_MAKEFILE) |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
268 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
269 |
# Param 1: Module to find deps for |
36506 | 270 |
FindDepsForModule = \ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
271 |
$(DEPS_$(strip $1)) |
36506 | 272 |
|
273 |
# Finds transitive dependencies in 3 levels. |
|
274 |
# Param 1: Module to find transitive deps for |
|
275 |
FindTransitiveDepsForModule = \ |
|
276 |
$(sort $(call FindDepsForModule, $1) \ |
|
277 |
$(foreach m, $(call FindDepsForModule, $1), \ |
|
278 |
$(call FindDepsForModule, $m) \ |
|
279 |
$(foreach n, $(call FindDepsForModule, $m), \ |
|
280 |
$(call FindDepsForModule, $n)))) |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
281 |
|
37975
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
282 |
# 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
|
283 |
# require an upradeable module. |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
284 |
FindAllUpgradeableModules = \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
285 |
$(filter-out $(MODULES_FILTER) $(NON_UPGRADEABLE_MODULES), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
286 |
$(sort $(UPGRADEABLE_MODULES) $(foreach m, \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
287 |
$(filter-out $(UPGRADEABLE_MODULES), $(call FindAllModules)), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
288 |
$(if $(filter $(UPGRADEABLE_MODULES), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
289 |
$(call FindTransitiveDepsForModule, $m)), \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
290 |
$m \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
291 |
) \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
292 |
)) \ |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
293 |
) |
551c5d86de79
8155786: Determine modules depending on upgradeable modules directly and indirectly
erikj
parents:
37973
diff
changeset
|
294 |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
295 |
################################################################################ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
296 |
|
42505
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
297 |
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
|
298 |
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
|
299 |
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
|
300 |
endif |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
301 |
LEGAL_SUBDIRS += share/legal |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
302 |
|
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
303 |
# 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
|
304 |
# $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
|
305 |
FindModuleLegalDirs = \ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
306 |
$(strip $(wildcard \ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
307 |
$(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
|
308 |
$(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
|
309 |
|
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
310 |
################################################################################ |
11439b0c0792
8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents:
42427
diff
changeset
|
311 |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
312 |
# Param 1 - Name of module |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
313 |
define ReadSingleImportMetaData |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
314 |
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
|
315 |
classloader := |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
316 |
include_in_jre := |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
317 |
include_in_jdk := |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
318 |
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
|
319 |
ifeq ($$(include_in_jre), true) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
320 |
JRE_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
321 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
322 |
ifeq ($$(include_in_jdk), true) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
323 |
JDK_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
324 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
325 |
ifeq ($$(classloader), boot) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
326 |
BOOT_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
327 |
else ifeq ($$(classloader), ext) |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
328 |
PLATFORM_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
329 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
330 |
else |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
331 |
# Default to include in all |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
332 |
JRE_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
333 |
JDK_MODULES += $1 |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
334 |
endif |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
335 |
endef |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
336 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
337 |
# 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
|
338 |
# 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
|
339 |
# 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
|
340 |
# * JRE_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
341 |
# * JDK_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
342 |
# * BOOT_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
343 |
# * PLATFORM_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
344 |
# * JRE_TOOL_MODULES |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
345 |
define ReadImportMetaData |
36725 | 346 |
IMPORTED_MODULES := $$(call FindImportedModules) |
347 |
$$(foreach m, $$(IMPORTED_MODULES), \ |
|
348 |
$$(eval $$(call ReadSingleImportMetaData, $$m))) |
|
36543
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
349 |
endef |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
350 |
|
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
351 |
################################################################################ |
a8ce27ddc757
8152197: Single place to specify module-specific information for images build
mchung
parents:
36506
diff
changeset
|
352 |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
353 |
endif # _MODULES_GMK |