comparison make/CreateBuildJdkCopy.gmk @ 55654:e297c7bb6469

8189861: Refactor CacheFind Reviewed-by: tbell
author erikj
date Tue, 24 Oct 2017 10:41:45 +0200
parents 28094715ae71
children 95b0376b6384
comparison
equal deleted inserted replaced
9:923d7b5eac2a 11:c8e99161d4b4
1 # 1 #
2 # Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this 7 # published by the Free Software Foundation. Oracle designates this
37 # Copy the modules needed to run jlink and jmod. Use bulk copy instead of 37 # Copy the modules needed to run jlink and jmod. Use bulk copy instead of
38 # SetupCopyFiles since there are so many files. 38 # SetupCopyFiles since there are so many files.
39 39
40 COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker 40 COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
41 41
42 $(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \ 42 $(COPY_CLASSES_TARGET): $(call FindFiles, $(wildcard \
43 $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY)))) 43 $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
44 $(call LogInfo, Copying java modules to buildjdk: $(MODULES_TO_COPY)) 44 $(call LogInfo, Copying java modules to buildjdk: $(MODULES_TO_COPY))
45 $(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules 45 $(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
46 $(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules 46 $(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
47 $(foreach m, $(MODULES_TO_COPY), \ 47 $(foreach m, $(MODULES_TO_COPY), \
54 ################################################################################ 54 ################################################################################
55 55
56 $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \ 56 $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
57 SRC := $(OUTPUTDIR), \ 57 SRC := $(OUTPUTDIR), \
58 DEST := $(BUILDJDK_OUTPUTDIR), \ 58 DEST := $(BUILDJDK_OUTPUTDIR), \
59 FILES := $(call CacheFind, $(wildcard \ 59 FILES := $(call FindFiles, $(wildcard \
60 $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \ 60 $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
61 )) 61 ))
62 62
63 TARGETS += $(COPY_SUPPORT_HEADERS) 63 TARGETS += $(COPY_SUPPORT_HEADERS)
64 64