make/Images.gmk
author lana
Thu, 08 Sep 2016 22:13:38 +0000
changeset 40838 1cba2e436777
parent 40612 cec3daf6324a
child 40843 8d602ded48c9
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     1
#
39954
3efb7ad969d5 8158050: Remove SA-JDI
dsamersoff
parents: 39384
diff changeset
     2
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     4
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    10
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    15
# accompanied this code).
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    16
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    20
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    23
# questions.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    24
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    25
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    26
default: all
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    27
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    28
include $(SPEC)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    29
include MakeBase.gmk
34116
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33437
diff changeset
    30
include Modules.gmk
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    31
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    32
TOOL_TARGETS :=
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27560
diff changeset
    33
JDK_TARGETS :=
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    34
JRE_TARGETS :=
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    35
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    36
# Hook to include the corresponding custom file, if present.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    37
$(eval $(call IncludeCustomExtension, , Images-pre.gmk))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    38
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    39
############################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    40
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    41
# All modules for the current target platform.
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    42
ALL_MODULES := $(call FindAllModules)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    43
36725
f458544b0d76 8153261: Clean up fix for JDK-8153217
erikj
parents: 36723
diff changeset
    44
$(eval $(call ReadImportMetaData))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    45
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37865
diff changeset
    46
JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37865
diff changeset
    47
    $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37865
diff changeset
    48
JDK_MODULES += $(ALL_MODULES)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    49
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    50
# Compact builds have additional modules
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    51
COMPACT1_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    52
COMPACT2_EXTRA_MODULES := jdk.xml.dom jdk.httpserver
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    53
COMPACT3_EXTRA_MODULES := java.smartcardio jdk.management \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    54
    jdk.naming.dns jdk.naming.rmi jdk.sctp jdk.security.auth
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    55
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    56
JRE_COMPACT1_MODULES := java.compact1 $(COMPACT1_EXTRA_MODULES)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    57
JRE_COMPACT2_MODULES := $(JRE_COMPACT1_MODULES) java.compact2 $(COMPACT2_EXTRA_MODULES)
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    58
JRE_COMPACT3_MODULES := $(JRE_COMPACT2_MODULES) java.compact3 $(COMPACT3_EXTRA_MODULES)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    59
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    60
JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    61
JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    62
JRE_COMPACT1_MODULES_LIST := $(call CommaList, $(JRE_COMPACT1_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    63
JRE_COMPACT2_MODULES_LIST := $(call CommaList, $(JRE_COMPACT2_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    64
JRE_COMPACT3_MODULES_LIST := $(call CommaList, $(JRE_COMPACT3_MODULES))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    65
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    66
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    67
# Release file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    68
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    69
BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    70
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    71
# Common way to emit a line into the release or info file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    72
define info-file-item # name value
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    73
  $(PRINTF) '%s="%s"\n' $1 $2 >> $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    74
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    75
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    76
# Param 1 - The file containing the MODULES list
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    77
define create-info-file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    78
  $(call info-file-item, "JAVA_VERSION", "$(VERSION_NUMBER)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    79
  $(call info-file-item, "JAVA_FULL_VERSION", "$(VERSION_STRING)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    80
  $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    81
  $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    82
  $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    83
  $(if $(JDK_ARCH_ABI_PROP_NAME), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    84
    $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"))
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    85
  $(call info-file-item, "SOURCE", "$(strip $(ALL_SOURCE_TIPS))")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    86
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    87
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    88
# Param 1 - The file containing the MODULES list
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    89
define prepare-info-file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    90
  $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    91
  $(MKDIR) -p $(@D)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    92
  $(RM) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    93
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    94
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    95
define info-file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    96
  $(call prepare-info-file)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    97
  $(call create-info-file)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    98
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    99
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   100
# Create a variable dependency file common for all release info files.
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   101
INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   102
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   103
ALL_SOURCE_TIPS = $(shell \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   104
    if [ -f $(SUPPORT_OUTPUTDIR)/source_tips ] ; then \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   105
      $(CAT) $(SUPPORT_OUTPUTDIR)/source_tips ; \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   106
    fi)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   107
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   108
$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   109
	$(info-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   110
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   111
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   112
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   113
JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   114
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   115
# Use this file inside the image as target for make rule
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   116
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   117
38845
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   118
JLINK_ORDER_RESOURCES := **module-info.class
40612
cec3daf6324a 8164858: Enable build-time use of java.lang.invoke resolve tracing
redestad
parents: 40241
diff changeset
   119
JLINK_JLI_CLASSES :=
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   120
ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   121
  JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
40612
cec3daf6324a 8164858: Enable build-time use of java.lang.invoke resolve tracing
redestad
parents: 40241
diff changeset
   122
  JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   123
endif
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   124
JLINK_ORDER_RESOURCES += \
38845
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   125
    /java.base/java/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   126
    /java.base/jdk/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   127
    /java.base/sun/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   128
    /java.base/com/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   129
    /jdk.localedata/** \
37865
94ea10488f02 8156756: Enable build-time use of resource ordering plugin
redestad
parents: 37770
diff changeset
   130
    #
94ea10488f02 8156756: Enable build-time use of resource ordering plugin
redestad
parents: 37770
diff changeset
   131
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   132
JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   133
    --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   134
    --release-info $(BASE_RELEASE_FILE) \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   135
    --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
40612
cec3daf6324a 8164858: Enable build-time use of java.lang.invoke resolve tracing
redestad
parents: 40241
diff changeset
   136
    $(JLINK_JLI_CLASSES) \
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   137
    #
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   138
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   139
ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   140
  JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   141
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   142
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   143
$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   144
    $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   145
	$(ECHO) Creating jdk jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   146
	$(RM) -r $(JDK_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   147
	$(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   148
	    --add-modules $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   149
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   150
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   151
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   152
    $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   153
	$(ECHO) Creating jre jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   154
	$(RM) -r $(JRE_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   155
	$(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   156
	    --add-modules $(JRE_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   157
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   158
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   159
JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   160
JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   161
JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   162
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   163
$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   164
    $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   165
	$(ECHO) Creating jre compact1 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   166
	$(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   167
	$(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   168
	    --output $(JRE_COMPACT1_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   169
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   170
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   171
$(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   172
    $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   173
	$(ECHO) Creating jre compact2 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   174
	$(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   175
	$(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   176
	    --output $(JRE_COMPACT2_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   177
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   178
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   179
$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   180
    $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   181
	$(ECHO) Creating jre compact3 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   182
	$(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   183
	$(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   184
	    --output $(JRE_COMPACT3_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   185
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   186
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   187
TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   188
TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   189
TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   190
TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   191
TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   192
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   193
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   194
# /man dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   195
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   196
# All variables in this section are assigned with simple =, without :, to enable
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   197
# more selective overriding from the custom version of this file.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   198
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   199
# Avoid evaluating this whole section on windows for speed and stability
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   200
ifneq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   201
  JRE_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   202
      java.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   203
      jjs.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   204
      keytool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   205
      orbd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   206
      pack200.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   207
      rmid.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   208
      rmiregistry.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   209
      servertool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   210
      tnameserv.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   211
      unpack200.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   212
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   213
  JDK_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   214
      $(JRE_MAN_PAGES) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   215
      appletviewer.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   216
      idlj.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   217
      jar.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   218
      jarsigner.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   219
      javac.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   220
      javadoc.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   221
      javah.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   222
      javap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   223
      jconsole.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   224
      jcmd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   225
      jdb.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   226
      jdeps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   227
      jinfo.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   228
      jmap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   229
      jps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   230
      jrunscript.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   231
      jstack.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   232
      jstat.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   233
      jstatd.1 \
28898
b4c9aede2259 8071338: Move policytool from JRE to JDK
weijun
parents: 28600
diff changeset
   234
      policytool.1 \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   235
      rmic.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   236
      schemagen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   237
      serialver.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   238
      wsgen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   239
      wsimport.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   240
      xjc.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   241
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   242
  # This variable is potentially overridden in the closed makefile.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   243
  MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   244
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   245
  ifeq ($(OPENJDK_TARGET_OS), linux)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   246
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   247
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   248
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   249
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   250
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   251
    MAN1_SUBDIR = sun/man/man1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   252
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   253
  ifeq ($(OPENJDK_TARGET_OS), macosx)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   254
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   255
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   256
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   257
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   258
  $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   259
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   260
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   261
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   262
  $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   263
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   264
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   265
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   266
  $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   267
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
30093
c8c926543552 8077992: Eliminate JDK build dependency of native2ascii and update Japanese nroff man pages to UTF-8 encoding
ihse
parents: 30091
diff changeset
   268
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   269
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   270
  $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   271
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
30093
c8c926543552 8077992: Eliminate JDK build dependency of native2ascii and update Japanese nroff man pages to UTF-8 encoding
ihse
parents: 30091
diff changeset
   272
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   273
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   274
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   275
    $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   276
	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   277
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   278
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   279
    $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   280
	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   281
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   282
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   283
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   284
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   285
    $(JRE_IMAGE_DIR)/man/ja:
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   286
	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   287
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   288
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   289
    $(JDK_IMAGE_DIR)/man/ja:
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   290
	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   291
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   292
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   293
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   294
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   295
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   296
        $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   297
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   298
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   299
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   300
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   301
        $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   302
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   303
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   304
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   305
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   306
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   307
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   308
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   309
        $(JRE_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   310
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   311
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   312
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   313
        $(JDK_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   314
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   315
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   316
  JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   317
  JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   318
endif # Windows
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   319
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   320
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   321
# /include dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   322
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   323
$(eval $(call SetupCopyFiles,COPY_INCLUDES, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   324
    SRC := $(JDK_OUTPUTDIR)/include, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   325
    DEST := $(JDK_IMAGE_DIR)/include, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   326
    FILES := $(call CacheFind,$(JDK_OUTPUTDIR)/include)))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   327
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   328
JDK_TARGETS += $(COPY_INCLUDES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   329
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   330
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   331
# doc files
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   332
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   333
JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   334
JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   335
JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   336
JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   337
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   338
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   339
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   340
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   341
# Processing license files from source area to image area
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   342
# These are modified to have the platform specific EOL chars.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   343
define process-doc-file
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   344
	$(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   345
	$(MKDIR) -p $(@D)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   346
	$(RM) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   347
	LC_ALL=C $(SED) 's/$$//g' $< > $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   348
	$(CHMOD) 444 $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   349
endef
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   350
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   351
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   352
	$(process-doc-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   353
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   354
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   355
	$(process-doc-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   356
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   357
JRE_TARGETS += $(JRE_DOC_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   358
JDK_TARGETS += $(JDK_DOC_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   359
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   360
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   361
# src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   362
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   363
$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   364
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   365
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   366
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   367
JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   368
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   369
################################################################################
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   370
# classlist
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   371
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   372
ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   373
  $(eval $(call SetupCopyFiles, JDK_COPY_CLASSLIST, \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   374
      FILES := $(SUPPORT_OUTPUTDIR)/classlist/classlist, \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   375
      DEST := $(JDK_IMAGE_DIR)/lib, \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   376
  ))
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   377
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   378
  JDK_TARGETS += $(JDK_COPY_CLASSLIST)
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   379
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   380
  $(eval $(call SetupCopyFiles, JRE_COPY_CLASSLIST, \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   381
      FILES := $(SUPPORT_OUTPUTDIR)/classlist/classlist, \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   382
      DEST := $(JRE_IMAGE_DIR)/lib, \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   383
  ))
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   384
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   385
  JRE_TARGETS += $(JRE_COPY_CLASSLIST)
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   386
endif
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   387
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
   388
################################################################################
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   389
# /demo dir
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   390
ifneq ($(findstring images, $(MAKECMDGOALS)), )
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   391
  $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   392
      SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   393
      DEST := $(JDK_IMAGE_DIR)/demo, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   394
      FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   395
          $(call DoubleDollar, $(call DoubleDollar, \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   396
      $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   397
          -type f -a ! \( -name "_the*" -o -name "javac_state" \) )))), \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   398
  ))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   399
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   400
  JDK_TARGETS += $(JDK_COPY_DEMOS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   401
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   402
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   403
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   404
# /sample dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   405
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   406
$(eval $(call SetupCopyFiles,COPY_SAMPLES, \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   407
    SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   408
    DEST := $(JDK_IMAGE_DIR)/sample, \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   409
    FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   410
        $(call CacheFind,$(SUPPORT_OUTPUTDIR)/sample/image))))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   411
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   412
JDK_TARGETS += $(COPY_SAMPLES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   413
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   414
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   415
# jrt-fs.jar
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   416
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   417
$(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   418
    SRC := $(SUPPORT_OUTPUTDIR), \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   419
    DEST := $(JDK_IMAGE_DIR), \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   420
    FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   421
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   422
JDK_TARGETS += $(COPY_JRTFS_JAR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   423
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   424
################################################################################
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   425
# Code coverage data files
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   426
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   427
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   428
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   429
  GCOV_FIND_EXPR := -type f -name "*.gcno"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   430
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   431
  $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   432
      SRC := $(OUTPUT_ROOT), \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   433
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   434
      FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   435
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   436
  SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   437
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   438
  $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   439
      SRC := $(OUTPUT_ROOT), \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   440
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   441
      FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   442
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   443
  SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   444
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   445
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   446
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   447
################################################################################
37653
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   448
# Debug symbols
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   449
# Since debug symbols are not included in the jmod files, they need to be copied
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   450
# in manually after generating the images.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   451
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   452
ALL_JDK_MODULES := $(JDK_MODULES)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   453
ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   454
    $(call FindTransitiveDepsForModule, $m)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   455
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   456
ifeq ($(OPENJDK_TARGET_OS), windows)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   457
  LIBS_TARGET_SUBDIR := bin
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   458
else
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   459
  LIBS_TARGET_SUBDIR := lib
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   460
endif
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   461
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   462
DEBUGINFO_SUFFIXES := .diz .debuginfo .pdb .map
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   463
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   464
# Param 1 - dir to find debuginfo files in
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   465
FindDebuginfoFiles = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   466
    $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   467
        $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   468
        $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   469
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   470
# On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   471
# dirs.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   472
ifeq ($(OPENJDK_TARGET_OS)-$(ZIP_EXTERNAL_DEBUG_SYMBOLS), macosx-false)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   473
  $(eval $(call FillCacheFind, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   474
      $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs/))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   475
  FindDebuginfoFiles = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   476
      $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   477
endif
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   478
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   479
# Param 1 - either JDK or JRE
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   480
SetupCopyDebuginfo = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   481
    $(foreach m, $(ALL_$1_MODULES), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   482
      $(eval $(call SetupCopyFiles, COPY_$1_LIBS_DEBUGINFO_$m, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   483
          SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$m, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   484
          DEST := $($1_IMAGE_DIR)/$(LIBS_TARGET_SUBDIR), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   485
          FILES := $(call FindDebuginfoFiles, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   486
              $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   487
      )) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   488
      $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   489
    )
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   490
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   491
# No space before argument to avoid having to put $(strip ) everywhere in
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   492
# implementation above.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   493
$(call SetupCopyDebuginfo,JDK)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   494
$(call SetupCopyDebuginfo,JRE)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   495
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   496
################################################################################
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   497
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   498
# Include custom post hook here to make it possible to augment the target lists
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   499
# before actual target prerequisites are declared.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   500
$(eval $(call IncludeCustomExtension, , Images-post.gmk))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   501
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   502
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   503
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   504
$(JRE_TARGETS): $(TOOL_JRE_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   505
$(JDK_TARGETS): $(TOOL_JDK_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   506
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   507
jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   508
    $(SYMBOLS_TARGETS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   509
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   510
$(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   511
$(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   512
$(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   513
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   514
profiles: $(TOOL_JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   515
    $(TOOL_JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   516
    $(TOOL_JRE_COMPACT3_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   517
    $(JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   518
    $(JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   519
    $(JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   520
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   521
.PHONY: default all jimages profiles