make/Images.gmk
author lana
Tue, 15 Mar 2016 14:50:00 -0700
changeset 36706 ccbc5ff54c9a
parent 36284 c59cc3dd4690
child 36506 17612cee3530
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
#
33926
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 30742
diff changeset
     2
# Copyright (c) 2014, 2015, 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
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    41
MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
31308
97ab382f3311 8078335: Re-examine jdk.accessibility/share/classes/com/sun/java/accessibility/util location
ptbrunet
parents: 30742
diff changeset
    42
               jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
34099
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33437
diff changeset
    43
               jdk.accessibility jdk.internal.le jdk.dynalink \
64da21aa58f6 8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents: 33437
diff changeset
    44
               jdk.scripting.nashorn jdk.scripting.nashorn.shell \
36171
7fe73c768138 8132743: Move netscape.javascript package from jdk.plugin to new module
ddehaven
parents: 35008
diff changeset
    45
               jdk.vm.ci jdk.management jdk.jsobject
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    46
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    47
# providers
34106
967bd03e052b 8043138: Attach API should not require jvmstat rmi protocol
jbachorik
parents: 34102
diff changeset
    48
PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.jvmstat.rmi \
967bd03e052b 8043138: Attach API should not require jvmstat rmi protocol
jbachorik
parents: 34102
diff changeset
    49
               jdk.localedata jdk.naming.dns jdk.naming.rmi jdk.zipfs
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    50
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    51
# tools
32261
f9a63dc7cb4f 8134260: jjs in jre directory fails with "Could not find or load main class jdk.nashorn.tools.jjs.Main"
sundar
parents: 32173
diff changeset
    52
TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \
32173
amurillo
parents: 32067 32171
diff changeset
    53
               jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \
33028
5520ed52f1c7 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents: 32261
diff changeset
    54
               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.jshell jdk.policytool jdk.rmic \
5520ed52f1c7 8134254: JShell API/tool: REPL for Java into JDK9
jlahoda
parents: 32261
diff changeset
    55
               jdk.xml.bind jdk.xml.ws
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    56
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    57
ifeq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    58
  PROVIDER_MODULES += jdk.crypto.mscapi
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    59
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    60
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    61
ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    62
  PROVIDER_MODULES += jdk.crypto.ucrypto
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    63
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    64
34116
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33437
diff changeset
    65
JRE_MODULES := $(filter-out $(MODULES_FILTER), $(MAIN_MODULES) $(PROVIDER_MODULES))
b746e382da18 8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents: 33437
diff changeset
    66
JDK_MODULES := $(filter-out $(MODULES_FILTER), $(JRE_MODULES) $(TOOLS_MODULES))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    67
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    68
# compact3 builds have additional modules
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    69
JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \
30085
936b85480edb 8042901: Allow com.sun.management to be in a different module to java.lang.management
sjiang
parents: 29444
diff changeset
    70
                       jdk.naming.rmi jdk.sctp jdk.security.auth jdk.management
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    71
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    72
# Replacing double-comma with a single comma is to workaround the issue
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27560
diff changeset
    73
# with some version of make on windows that doesn't substitute spaces
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    74
# with one comma properly as with make 4.0
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    75
define SubstComma
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    76
  $(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1)))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    77
endef
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    78
JRE_MODULES_LIST := $(call SubstComma, $(JRE_MODULES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    79
JDK_MODULES_LIST := $(call SubstComma, $(JDK_MODULES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    80
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    81
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    82
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    83
JRE_SORTED_MODULES := $(SUPPORT_OUTPUTDIR)/jre-sorted-modules
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    84
JDK_SORTED_MODULES := $(SUPPORT_OUTPUTDIR)/jdk-sorted-modules
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    85
JRE_COMPACT1_SORTED_MODULES := $(SUPPORT_OUTPUTDIR)/compact1-sorted-modules
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    86
JRE_COMPACT2_SORTED_MODULES := $(SUPPORT_OUTPUTDIR)/compact2-sorted-modules
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    87
JRE_COMPACT3_SORTED_MODULES := $(SUPPORT_OUTPUTDIR)/compact3-sorted-modules
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    88
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    89
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    90
MODULES_CMDS := $(SUPPORT_OUTPUTDIR)/modules_cmds-stripped
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    91
MODULES_LIBS := $(SUPPORT_OUTPUTDIR)/modules_libs-stripped
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    92
MODULES_CONF := $(SUPPORT_OUTPUTDIR)/modules_conf
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    93
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    94
JIMAGE_TOOL := $(JAVA_SMALL) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    95
    -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    96
    -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.module.ImageBuilder \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    97
    --cmds $(MODULES_CMDS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    98
    --libs $(MODULES_LIBS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    99
    --configs $(MODULES_CONF) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   100
    --classes $(JDK_OUTPUTDIR)/modules \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   101
    --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   102
    #
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   103
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   104
MODULES_XML += $(SRC_ROOT)/modules.xml
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   105
DEPENDENCIES := $(call CacheFind, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   106
    $(SUPPORT_OUTPUTDIR)/modules_cmds \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   107
    $(SUPPORT_OUTPUTDIR)/modules_conf \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   108
    $(SUPPORT_OUTPUTDIR)/modules_libs) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   109
    $(wildcard $(JDK_OUTPUTDIR)/modules/*/_*) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   110
    $(MODULES_XML)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   111
    #
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   112
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   113
# Use this file inside the image as target for make rule
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   114
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   115
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   116
$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   117
    $(call DependOnVariable, JDK_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   118
	$(ECHO) Creating jdk jimage
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   119
	$(RM) -r $(JDK_IMAGE_DIR) $(JDK_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   120
	$(JIMAGE_TOOL) --mods $(JDK_MODULES_LIST) --output $(JDK_IMAGE_DIR) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   121
	    $(MODULES_XML) > $(JDK_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   122
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   123
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   124
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   125
    $(call DependOnVariable, JRE_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   126
	$(ECHO) Creating jre jimage
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   127
	$(RM) -r $(JRE_IMAGE_DIR) $(JRE_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   128
	$(JIMAGE_TOOL) --mods $(JRE_MODULES_LIST) --output $(JRE_IMAGE_DIR) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   129
	    $(MODULES_XML) > $(JRE_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   130
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   131
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   132
JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   133
JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   134
JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   135
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   136
COMPACT_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   137
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   138
$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   139
    $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   140
	$(ECHO) Creating jre compact1 jimage
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   141
	$(RM) -r $(JRE_COMPACT1_IMAGE_DIR) $(JRE_COMPACT1_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   142
	$(JIMAGE_TOOL) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   143
	    --mods $(call SubstComma, java.compact1 $(COMPACT_EXTRA_MODULES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   144
	    --output $(JRE_COMPACT1_IMAGE_DIR) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   145
	    $(MODULES_XML) > $(JRE_COMPACT1_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   146
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   147
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   148
$(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   149
    $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   150
	$(ECHO) Creating jre compact2 jimage
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   151
	$(RM) -r $(JRE_COMPACT2_IMAGE_DIR) $(JRE_COMPACT2_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   152
	$(JIMAGE_TOOL) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   153
	    --mods $(call SubstComma, java.compact2 $(COMPACT_EXTRA_MODULES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   154
	    --output $(JRE_COMPACT2_IMAGE_DIR) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   155
	    $(MODULES_XML) > $(JRE_COMPACT2_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   156
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   157
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   158
$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(DEPENDENCIES) \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   159
    $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   160
	$(ECHO) Creating jre compact3 jimage
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   161
	$(RM) -r $(JRE_COMPACT3_IMAGE_DIR) $(JRE_COMPACT3_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   162
	$(JIMAGE_TOOL) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   163
	    --mods $(call SubstComma, $(JDK_COMPACT3_MODULES) $(COMPACT_EXTRA_MODULES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   164
	    --output $(JRE_COMPACT3_IMAGE_DIR) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   165
	    $(MODULES_XML) > $(JRE_COMPACT3_SORTED_MODULES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   166
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   167
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   168
TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   169
TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   170
TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   171
TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   172
TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   173
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   174
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   175
# /man dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   176
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   177
# All variables in this section are assigned with simple =, without :, to enable
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   178
# more selective overriding from the custom version of this file.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   179
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   180
# Avoid evaluating this whole section on windows for speed and stability
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   181
ifneq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   182
  JRE_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   183
      java.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   184
      jjs.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   185
      keytool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   186
      orbd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   187
      pack200.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   188
      rmid.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   189
      rmiregistry.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   190
      servertool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   191
      tnameserv.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   192
      unpack200.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   193
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   194
  ifndef OPENJDK
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   195
    ifneq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   196
      JRE_MAN_PAGES += javaws.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   197
    endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   198
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   199
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   200
  JDK_MAN_PAGES += \
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
      appletviewer.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   203
      idlj.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   204
      jar.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   205
      jarsigner.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   206
      javac.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   207
      javadoc.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   208
      javah.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   209
      javap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   210
      jconsole.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   211
      jcmd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   212
      jdb.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   213
      jdeps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   214
      jinfo.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   215
      jmap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   216
      jps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   217
      jrunscript.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   218
      jsadebugd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   219
      jstack.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   220
      jstat.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   221
      jstatd.1 \
28898
b4c9aede2259 8071338: Move policytool from JRE to JDK
weijun
parents: 28600
diff changeset
   222
      policytool.1 \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   223
      rmic.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   224
      schemagen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   225
      serialver.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   226
      wsgen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   227
      wsimport.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   228
      xjc.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   229
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   230
  # This variable is potentially overridden in the closed makefile.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   231
  MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   232
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   233
  ifeq ($(OPENJDK_TARGET_OS), linux)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   234
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   235
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   236
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   237
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   238
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   239
    MAN1_SUBDIR = sun/man/man1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   240
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   241
  ifeq ($(OPENJDK_TARGET_OS), macosx)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   242
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   243
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   244
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   245
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   246
  $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   247
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   248
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   249
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   250
  $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   251
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   252
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   253
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   254
  $(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
   255
	$(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
   256
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   257
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   258
  $(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
   259
	$(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
   260
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   261
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   262
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   263
    $(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
   264
	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   265
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   266
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   267
    $(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
   268
	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   269
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   270
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   271
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   272
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   273
    $(JRE_IMAGE_DIR)/man/ja:
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   274
	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   275
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   276
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   277
    $(JDK_IMAGE_DIR)/man/ja:
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   278
	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   279
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   280
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   281
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   282
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   283
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   284
        $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   285
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   286
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   287
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   288
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   289
        $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   290
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   291
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
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
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
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_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   297
        $(JRE_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   298
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   299
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   300
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   301
        $(JDK_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   302
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   303
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   304
  JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   305
  JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   306
endif # Windows
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   307
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   308
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   309
# /include dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   310
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   311
$(eval $(call SetupCopyFiles,COPY_INCLUDES, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   312
    SRC := $(JDK_OUTPUTDIR)/include, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   313
    DEST := $(JDK_IMAGE_DIR)/include, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   314
    FILES := $(call CacheFind,$(JDK_OUTPUTDIR)/include)))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   315
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   316
JDK_TARGETS += $(COPY_INCLUDES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   317
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   318
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   319
# doc files
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   320
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   321
JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   322
JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   323
JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   324
JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   325
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   326
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   327
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   328
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   329
# Processing license files from source area to image area
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   330
# These are modified to have the platform specific EOL chars.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   331
define process-doc-file
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   332
	$(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   333
	$(MKDIR) -p $(@D)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   334
	$(RM) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   335
	LC_ALL=C $(SED) 's/$$//g' $< > $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   336
	$(CHMOD) 444 $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   337
endef
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   338
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   339
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   340
	$(process-doc-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   341
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   342
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   343
	$(process-doc-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   344
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   345
JRE_TARGETS += $(JRE_DOC_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   346
JDK_TARGETS += $(JDK_DOC_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   347
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   348
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   349
# Release file
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   350
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   351
JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   352
JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   353
JRE_COMPACT1_INFO_FILE := $(JRE_COMPACT1_IMAGE_DIR)/release
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   354
JRE_COMPACT2_INFO_FILE := $(JRE_COMPACT2_IMAGE_DIR)/release
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   355
JRE_COMPACT3_INFO_FILE := $(JRE_COMPACT3_IMAGE_DIR)/release
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   356
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   357
# Common way to emit a line into the release or info file
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   358
define info-file-item # name value
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   359
  $(PRINTF) '%s="%s"\n' $1 $2 >> $@
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   360
endef
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   361
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   362
# Param 1 - The file containing the MODULES list
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   363
define create-info-file
33926
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 30742
diff changeset
   364
  $(call info-file-item, "JAVA_VERSION", "$(VERSION_NUMBER)")
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 30742
diff changeset
   365
  $(call info-file-item, "JAVA_FULL_VERSION", "$(VERSION_STRING)")
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   366
  $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   367
  $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   368
  $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   369
  $(if $(JDK_ARCH_ABI_PROP_NAME), \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   370
    $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"))
33926
3a19edba4808 8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents: 30742
diff changeset
   371
  $(call info-file-item, "SOURCE", "$(strip $(ALL_SOURCE_TIPS))")
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   372
  $(call info-file-item, "MODULES", "`$(CAT) $1`")
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   373
endef
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   374
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   375
# Param 1 - The file containing the MODULES list
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   376
define prepare-info-file
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   377
  $(call LogInfo, Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   378
  $(MKDIR) -p $(@D)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   379
  $(RM) $@
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   380
endef
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   381
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   382
define info-file
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   383
  $(call prepare-info-file, $1)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   384
  $(call create-info-file, $1)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   385
endef
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   386
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   387
# Create a variable dependency file common for all release info files. The
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   388
# sorted module list will only change if the image is regenerated, which will
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   389
# trigger a rebuild of these files anyway.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   390
INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   391
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   392
ALL_SOURCE_TIPS = $(shell \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   393
    if [ -f $(SUPPORT_OUTPUTDIR)/source_tips ] ; then \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   394
      $(CAT) $(SUPPORT_OUTPUTDIR)/source_tips ; \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   395
    fi)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   396
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   397
$(JRE_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   398
	$(call info-file, $(JRE_SORTED_MODULES))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   399
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   400
$(JDK_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   401
	$(call info-file, $(JDK_SORTED_MODULES))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   402
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   403
$(JRE_COMPACT1_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   404
	$(call info-file, $(JRE_COMPACT1_SORTED_MODULES))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   405
	$(call info-file-item, "JAVA_PROFILE", "compact1")
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   406
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   407
$(JRE_COMPACT2_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   408
	$(call info-file, $(JRE_COMPACT2_SORTED_MODULES))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   409
	$(call info-file-item, "JAVA_PROFILE", "compact2")
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   410
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   411
$(JRE_COMPACT3_INFO_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28356
diff changeset
   412
	$(call info-file, $(JRE_COMPACT3_SORTED_MODULES))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   413
	$(call info-file-item, "JAVA_PROFILE", "compact3")
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   414
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   415
JRE_TARGETS += $(JRE_INFO_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   416
JDK_TARGETS += $(JDK_INFO_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   417
JRE_COMPACT1_TARGETS += $(JRE_COMPACT1_INFO_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   418
JRE_COMPACT2_TARGETS += $(JRE_COMPACT2_INFO_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   419
JRE_COMPACT3_TARGETS += $(JRE_COMPACT3_INFO_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   420
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   421
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   422
# src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   423
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   424
$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   425
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   426
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   427
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   428
JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   429
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   430
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   431
# /demo dir
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   432
ifneq ($(findstring images, $(MAKECMDGOALS)), )
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   433
  $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   434
      SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   435
      DEST := $(JDK_IMAGE_DIR)/demo, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   436
      FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   437
          $(call DoubleDollar, $(call DoubleDollar, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   438
          $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   439
          -type f -a ! \( -name "_the*" -o -name "javac_state" \) )))), \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   440
  ))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   441
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   442
  JDK_TARGETS += $(JDK_COPY_DEMOS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   443
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   444
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   445
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   446
# /sample dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   447
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   448
$(eval $(call SetupCopyFiles, COPY_SAMPLES, \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   449
    SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   450
    DEST := $(JDK_IMAGE_DIR)/sample, \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   451
    FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   452
        $(call CacheFind,$(SUPPORT_OUTPUTDIR)/sample/image))))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   453
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   454
JDK_TARGETS += $(COPY_SAMPLES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   455
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   456
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   457
# jrt-fs.jar
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   458
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   459
$(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   460
    SRC := $(SUPPORT_OUTPUTDIR), \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   461
    DEST := $(JDK_IMAGE_DIR), \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   462
    FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   463
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   464
JDK_TARGETS += $(COPY_JRTFS_JAR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   465
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   466
################################################################################
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   467
# Code coverage data files
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   468
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   469
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   470
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   471
  GCOV_FIND_EXPR := -type f -name "*.gcno"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   472
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   473
  $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   474
      SRC := $(OUTPUT_ROOT), \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   475
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   476
      FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   477
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   478
  SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   479
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   480
  $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   481
      SRC := $(OUTPUT_ROOT), \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   482
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   483
      FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   484
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   485
  SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   486
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   487
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   488
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   489
################################################################################
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   490
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   491
# Include custom post hook here to make it possible to augment the target lists
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   492
# before actual target prerequisites are declared.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   493
$(eval $(call IncludeCustomExtension, , Images-post.gmk))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   494
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   495
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   496
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   497
$(JRE_TARGETS): $(TOOL_JRE_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   498
$(JDK_TARGETS): $(TOOL_JDK_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   499
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   500
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
   501
    $(SYMBOLS_TARGETS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   502
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   503
$(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   504
$(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   505
$(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   506
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   507
profiles: $(TOOL_JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   508
    $(TOOL_JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   509
    $(TOOL_JRE_COMPACT3_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   510
    $(JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   511
    $(JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   512
    $(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
.PHONY: default all jimages profiles