make/CreateBuildJdkCopy.gmk
author dfuchs
Fri, 09 Jun 2017 16:52:07 +0100
changeset 45535 4b19310ae4ee
parent 41458 f285e333e8db
child 47253 92fd0e04e0e1
permissions -rw-r--r--
8181867: [tests] Reorganize EchoHandlers Summary: This fix reorganize some test files and rename some test classes. Several classes named EchoHandler in the unnamed package are renamed to make it clear what classes (and sources) tests that use these EchoHandler implementations effectively depend on. Reviewed-by: chegar
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36506
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     1
#
41458
f285e333e8db 8167424: Various trivial fixes in build system
ihse
parents: 37770
diff changeset
     2
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
36506
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     4
#
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    10
#
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    15
# accompanied this code).
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    16
#
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    20
#
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    23
# questions.
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    24
#
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    25
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    26
default: all
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    27
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    28
include $(SPEC)
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    29
include MakeBase.gmk
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    30
include Modules.gmk
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    31
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37764
diff changeset
    32
MODULES_TO_COPY := $(sort \
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37764
diff changeset
    33
    $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37764
diff changeset
    34
      $(call FindTransitiveDepsForModule, $m) $m))
36506
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    35
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    36
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    37
# Copy the modules needed to run jlink and jmod. Use bulk copy instead of
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    38
# SetupCopyFiles since there are so many files.
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    39
37764
63e0379dd186 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36506
diff changeset
    40
COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
36506
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    41
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    42
$(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    43
    $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    44
	$(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)"
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    45
	$(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    46
	$(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    47
	$(foreach m, $(MODULES_TO_COPY), \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    48
	    $(CP) -R $(JDK_OUTPUTDIR)/modules/$m \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    49
	        $(BUILDJDK_OUTPUTDIR)/jdk/modules/ $(NEWLINE))
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    50
	$(TOUCH) $@
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    51
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    52
TARGETS += $(COPY_CLASSES_TARGET)
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    53
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    54
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    55
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    56
$(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    57
    SRC := $(BUILD_OUTPUT), \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    58
    DEST := $(BUILDJDK_OUTPUTDIR), \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    59
    FILES := $(call CacheFind, $(wildcard \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    60
        $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    61
))
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    62
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    63
TARGETS += $(COPY_SUPPORT_HEADERS)
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    64
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    65
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    66
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    67
$(eval $(call SetupCopyFiles, COPY_JDK_LIB_FILES, \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    68
    SRC := $(BUILD_OUTPUT), \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    69
    DEST := $(BUILDJDK_OUTPUTDIR), \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    70
    FILES := $(JDK_OUTPUTDIR)/lib/tzdb.dat, \
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    71
))
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    72
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    73
TARGETS += $(COPY_JDK_LIB_FILES)
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    74
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    75
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    76
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    77
all: $(TARGETS)
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    78
17612cee3530 8142968: Module System implementation
alanb
parents:
diff changeset
    79
.PHONY: default all