author | eosterlund |
Thu, 07 Nov 2019 10:28:29 +0000 | |
changeset 58961 | 5d462d4b7a8b |
parent 58487 | 43f63f904bbc |
permissions | -rw-r--r-- |
52464
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
1 |
# |
54380 | 2 |
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. |
52464
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
4 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
10 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
15 |
# accompanied this code). |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
16 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
20 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
23 |
# questions. |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
24 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
25 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
26 |
default: all |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
27 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
28 |
include $(SPEC) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
29 |
include MakeBase.gmk |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
30 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
31 |
GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
32 |
SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
33 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
34 |
################################################################################ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
35 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
36 |
PROC_SRC_SUBDIRS := \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
37 |
org.graalvm.compiler.hotspot.management \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
38 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
39 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
40 |
PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS)) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
41 |
|
54380 | 42 |
PROC_SRCS := $(filter %.java, $(call FindFiles, $(PROC_SRC_DIRS))) |
52464
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
43 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
44 |
ALL_SRC_DIRS := $(SRC_DIR) $(wildcard $(SRC_DIR)/*/src) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
45 |
SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS)) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
46 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
47 |
PROCESSOR_JARS := \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
48 |
$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
49 |
# |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
50 |
PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS)) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
51 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
52 |
$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
53 |
$(call MakeDir, $(@D)) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
54 |
$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files)) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
55 |
$(JAVA) $(NEW_JAVAC) \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
56 |
-XDignore.symbol.file \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
57 |
--upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
58 |
-sourcepath $(SOURCEPATH) \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
59 |
-implicit:none \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
60 |
-proc:only \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
61 |
-processorpath $(PROCESSOR_PATH) \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
62 |
-d $(GENSRC_DIR) \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
63 |
-s $(GENSRC_DIR) \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
64 |
@$(@D)/_gensrc_proc_files |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
65 |
$(TOUCH) $@ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
66 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
67 |
TARGETS += $(GENSRC_DIR)/_gensrc_proc_done |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
68 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
69 |
################################################################################ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
70 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
71 |
$(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
72 |
$(ECHO) "" > $@; |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
73 |
($(CD) $(GENSRC_DIR)/META-INF/providers && \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
74 |
p=""; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
75 |
impl=""; \ |
58487
43f63f904bbc
8231902: Build of jdk.internal.vm.compiler.management/module-info.java.extra failed
dlong
parents:
54380
diff
changeset
|
76 |
for i in $$($(NAWK) '$$0=FILENAME" "$$0' * | $(SORT) -k 2 | $(SED) 's/ .*//'); do \ |
52464
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
77 |
c=$$($(CAT) $$i | $(TR) -d '\n\r'); \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
78 |
if test x$$p != x$$c; then \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
79 |
if test x$$p != x; then \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
80 |
$(ECHO) " ;" >> $@; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
81 |
fi; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
82 |
$(ECHO) "provides $$c with" >> $@; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
83 |
p=$$c; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
84 |
impl=""; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
85 |
fi; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
86 |
if test x$$impl != x; then \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
87 |
$(ECHO) " , $$i" >> $@; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
88 |
else \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
89 |
$(ECHO) " $$i" >> $@; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
90 |
fi; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
91 |
impl=$$i; \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
92 |
done); \ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
93 |
$(ECHO) " ;" >> $@; |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
94 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
95 |
TARGETS += $(GENSRC_DIR)/module-info.java.extra |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
96 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
97 |
################################################################################ |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
98 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
99 |
all: $(TARGETS) |
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
100 |
|
c139884bd80e
8213348: jdk.internal.vm.compiler.management service providers missing in module descriptor
dlong
parents:
diff
changeset
|
101 |
.PHONY: default all |