author | ysuenaga |
Fri, 11 Dec 2015 21:58:28 +0900 | |
changeset 34493 | c68e0ab807d8 |
parent 34116 | b746e382da18 |
child 35008 | ef0cd710989f |
child 35024 | 25bc9069e077 |
permissions | -rw-r--r-- |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
1 |
# |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
2 |
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
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 |
|
26548 | 29 |
include JavaCompilation.gmk |
30 |
include SetupJavaCompilers.gmk |
|
31 |
||
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
32 |
################################################################################ |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
33 |
# Some platforms don't have the serviceability agent |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
34 |
ifeq ($(INCLUDE_SA), false) |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
35 |
MODULES_FILTER += jdk.hotspot.agent |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
36 |
endif |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
37 |
|
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
38 |
################################################################################ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
39 |
# Module list macros |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
40 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
41 |
ALL_TOP_SRC_DIRS := \ |
33045
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
30095
diff
changeset
|
42 |
$(HOTSPOT_TOPDIR)/src \ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
43 |
$(JDK_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
44 |
$(LANGTOOLS_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
45 |
$(CORBA_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
46 |
$(JAXP_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
47 |
$(JAXWS_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
48 |
$(NASHORN_TOPDIR)/src \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
49 |
# |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
50 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
51 |
# Find all modules with java sources by looking in the source dirs |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
52 |
# jdk.hotspot.agent currently doesn't comply with source dir policy. |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
53 |
define FindJavaModules |
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
27602
diff
changeset
|
54 |
$(filter-out $(MODULES_FILTER), $(sort $(notdir \ |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
55 |
$(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir \ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
56 |
$(wildcard $(patsubst %,%/*/share/classes/*, $(ALL_TOP_SRC_DIRS)) \ |
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27137
diff
changeset
|
57 |
$(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)) \ |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
58 |
$(patsubst %,%/*/$(OPENJDK_TARGET_OS_TYPE)/classes/*, $(ALL_TOP_SRC_DIRS))))))))))) \ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
59 |
jdk.hotspot.agent) |
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
60 |
endef |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
61 |
|
26548 | 62 |
# Find all modules with source for the target platform. |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
63 |
# jdk.hotspot.agent currently doesn't comply with source dir policy. |
26548 | 64 |
define FindAllModules |
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
27602
diff
changeset
|
65 |
$(sort $(filter-out $(MODULES_FILTER) closed demo sample, \ |
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
27602
diff
changeset
|
66 |
$(notdir $(patsubst %/,%, $(dir \ |
26548 | 67 |
$(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \ |
68 |
$(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \ |
|
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
69 |
$(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS)))))) \ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33045
diff
changeset
|
70 |
jdk.hotspot.agent)) |
26548 | 71 |
endef |
72 |
||
73 |
################################################################################ |
|
74 |
||
75 |
$(eval $(call SetupJavaCompilation,BUILD_GENMODULESLIST, \ |
|
76 |
SETUP := BOOT_JAVAC, \ |
|
77 |
SRC := $(JDK_TOPDIR)/make/src/classes, \ |
|
78 |
INCLUDES := build/tools/module, \ |
|
27560 | 79 |
EXCLUDE_FILES := ImageBuilder.java ModuleArchive.java, \ |
26671
b214ab286ce9
8058797: Building with sjavac broken after JDK-8058118
erikj
parents:
26548
diff
changeset
|
80 |
BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist, \ |
b214ab286ce9
8058797: Building with sjavac broken after JDK-8058118
erikj
parents:
26548
diff
changeset
|
81 |
DISABLE_SJAVAC := true)) |
26548 | 82 |
|
83 |
TOOL_GENMODULESLIST = $(JAVA_SMALL) \ |
|
84 |
-cp "$(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist" \ |
|
85 |
build.tools.module.GenModulesList |
|
86 |
||
87 |
MODULES_LIST_FILE := $(MAKESUPPORT_OUTPUTDIR)/modules.list |
|
88 |
MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk |
|
89 |
||
90 |
$(MODULES_LIST_FILE): $(SRC_ROOT)/modules.xml \ |
|
91 |
$(BUILD_GENMODULESLIST) |
|
92 |
$(TOOL_GENMODULESLIST) -o $@ $(filter %.xml, $^) |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
93 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
94 |
$(MODULE_DEPS_MAKEFILE): $(MODULES_LIST_FILE) |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
95 |
$(CAT) $^ | $(SED) -e 's/^\([^:]*\):/DEPS_\1 :=/g' > $@ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
96 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
97 |
-include $(MODULE_DEPS_MAKEFILE) |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
98 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
99 |
# Param 1: Module to find deps for |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
100 |
define FindDepsForModule |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
101 |
$(DEPS_$(strip $1)) |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
102 |
endef |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
103 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
104 |
################################################################################ |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
105 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
106 |
# Hook to include the corresponding custom file, if present. |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
107 |
$(eval $(call IncludeCustomExtension, , common/Modules.gmk)) |
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
108 |
|
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
diff
changeset
|
109 |
endif # _MODULES_GMK |