make/Images.gmk
author rfield
Fri, 01 Apr 2016 09:20:33 -0700
changeset 36780 6bf2bef08a91
parent 36543 a8ce27ddc757
child 36723 295e7ec5d8f9
permissions -rw-r--r--
8152925: JShell: enable corralling of any type declaration, including enum Reviewed-by: jlahoda
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
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
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    44
$(eval $(call ReadImportMetaData))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    45
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    46
JRE_MODULES += $(filter-out $(MODULES_FILTER), $(BOOT_MODULES) $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    47
JDK_MODULES += $(filter-out $(MODULES_FILTER), $(ALL_MODULES))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    48
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    49
# Compact builds have additional modules
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    50
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
    51
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
    52
COMPACT3_EXTRA_MODULES := java.smartcardio jdk.management \
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    53
    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
    54
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    55
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
    56
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
    57
JRE_COMPACT3_MODULES := $(JRE_COMPACT2_MODULES) java.compact3 $(COMPACT3_EXTRA_MODULES)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    58
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    59
# 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
    60
# with some version of make on windows that doesn't substitute spaces
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    61
# with one comma properly as with make 4.0
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    62
SubstComma = \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    63
    $(strip \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    64
        $(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1))) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    65
    )
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    66
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    67
JRE_MODULES_LIST := $(call SubstComma, $(JRE_MODULES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    68
JDK_MODULES_LIST := $(call SubstComma, $(JDK_MODULES))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    69
JRE_COMPACT1_MODULES_LIST := $(call SubstComma, $(JRE_COMPACT1_MODULES))
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    70
JRE_COMPACT2_MODULES_LIST := $(call SubstComma, $(JRE_COMPACT2_MODULES))
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    71
JRE_COMPACT3_MODULES_LIST := $(call SubstComma, $(JRE_COMPACT3_MODULES))
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    72
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    73
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    74
# Release file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    75
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    76
BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    77
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    78
# Common way to emit a line into the release or info file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    79
define info-file-item # name value
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    80
  $(PRINTF) '%s="%s"\n' $1 $2 >> $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    81
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    82
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    83
# Param 1 - The file containing the MODULES list
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    84
define create-info-file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    85
  $(call info-file-item, "JAVA_VERSION", "$(VERSION_NUMBER)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    86
  $(call info-file-item, "JAVA_FULL_VERSION", "$(VERSION_STRING)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    87
  $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    88
  $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    89
  $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    90
  $(if $(JDK_ARCH_ABI_PROP_NAME), \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    91
    $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"))
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    92
  $(call info-file-item, "SOURCE", "$(strip $(ALL_SOURCE_TIPS))")
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
# Param 1 - The file containing the MODULES list
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    96
define prepare-info-file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    97
  $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    98
  $(MKDIR) -p $(@D)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    99
  $(RM) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   100
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   101
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   102
define info-file
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   103
  $(call prepare-info-file)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   104
  $(call create-info-file)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   105
endef
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   106
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   107
# Create a variable dependency file common for all release info files.
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   108
INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   109
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   110
ALL_SOURCE_TIPS = $(shell \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   111
    if [ -f $(SUPPORT_OUTPUTDIR)/source_tips ] ; then \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   112
      $(CAT) $(SUPPORT_OUTPUTDIR)/source_tips ; \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   113
    fi)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   114
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   115
$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   116
	$(info-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   117
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   118
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   119
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   120
JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   121
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   122
# Use this file inside the image as target for make rule
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   123
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   124
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   125
JLINK_TOOL := $(JLINK) --modulepath $(IMAGES_OUTPUTDIR)/jmods \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   126
              --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   127
              --release-info $(BASE_RELEASE_FILE)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   128
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   129
ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   130
  JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   131
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   132
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   133
$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   134
    $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   135
	$(ECHO) Creating jdk jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   136
	$(RM) -r $(JDK_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   137
	$(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   138
	    --addmods $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   139
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   140
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   141
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   142
    $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   143
	$(ECHO) Creating jre jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   144
	$(RM) -r $(JRE_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   145
	$(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   146
	    --addmods $(JRE_MODULES_LIST)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   147
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   148
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   149
JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   150
JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   151
JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   152
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   153
$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   154
    $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   155
	$(ECHO) Creating jre compact1 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   156
	$(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   157
	$(JLINK_TOOL) --addmods $(JRE_COMPACT1_MODULES_LIST) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   158
	    --output $(JRE_COMPACT1_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   159
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   160
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   161
$(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   162
    $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   163
	$(ECHO) Creating jre compact2 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   164
	$(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   165
	$(JLINK_TOOL) --addmods $(JRE_COMPACT2_MODULES_LIST) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   166
	    --output $(JRE_COMPACT2_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   167
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   168
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   169
$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   170
    $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   171
	$(ECHO) Creating jre compact3 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   172
	$(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   173
	$(JLINK_TOOL) --addmods $(JRE_COMPACT3_MODULES_LIST) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   174
	    --output $(JRE_COMPACT3_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   175
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   176
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   177
TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   178
TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   179
TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   180
TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   181
TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   182
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   183
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   184
# /man dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   185
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   186
# All variables in this section are assigned with simple =, without :, to enable
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   187
# more selective overriding from the custom version of this file.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   188
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   189
# Avoid evaluating this whole section on windows for speed and stability
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   190
ifneq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   191
  JRE_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   192
      java.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   193
      jjs.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   194
      keytool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   195
      orbd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   196
      pack200.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   197
      rmid.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   198
      rmiregistry.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   199
      servertool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   200
      tnameserv.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   201
      unpack200.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   202
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   203
  ifndef OPENJDK
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   204
    ifneq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   205
      JRE_MAN_PAGES += javaws.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   206
    endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   207
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   208
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   209
  JDK_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   210
      $(JRE_MAN_PAGES) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   211
      appletviewer.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   212
      idlj.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   213
      jar.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   214
      jarsigner.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   215
      javac.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   216
      javadoc.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   217
      javah.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   218
      javap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   219
      jconsole.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   220
      jcmd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   221
      jdb.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   222
      jdeps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   223
      jinfo.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   224
      jmap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   225
      jps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   226
      jrunscript.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   227
      jsadebugd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   228
      jstack.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   229
      jstat.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   230
      jstatd.1 \
28898
b4c9aede2259 8071338: Move policytool from JRE to JDK
weijun
parents: 28600
diff changeset
   231
      policytool.1 \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   232
      rmic.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   233
      schemagen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   234
      serialver.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   235
      wsgen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   236
      wsimport.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   237
      xjc.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   238
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   239
  # This variable is potentially overridden in the closed makefile.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   240
  MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   241
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   242
  ifeq ($(OPENJDK_TARGET_OS), linux)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   243
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   244
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   245
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   246
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   247
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   248
    MAN1_SUBDIR = sun/man/man1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   249
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   250
  ifeq ($(OPENJDK_TARGET_OS), macosx)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   251
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   252
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   253
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   254
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   255
  $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   256
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   257
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   258
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   259
  $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   260
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   261
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   262
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   263
  $(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
   264
	$(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
   265
	$(install-file)
27560
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_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   268
	$(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
   269
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   270
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   271
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   272
    $(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
   273
	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   274
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   275
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   276
    $(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
   277
	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   278
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   279
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   280
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   281
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   282
    $(JRE_IMAGE_DIR)/man/ja:
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   283
	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   284
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   285
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   286
    $(JDK_IMAGE_DIR)/man/ja:
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   287
	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   288
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   289
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   290
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   291
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   292
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   293
        $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   294
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   295
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   296
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   297
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   298
        $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   299
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   300
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   301
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   302
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   303
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   304
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   305
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   306
        $(JRE_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   307
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   308
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   309
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   310
        $(JDK_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   311
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   312
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   313
  JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   314
  JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   315
endif # Windows
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   316
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   317
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   318
# /include dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   319
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   320
$(eval $(call SetupCopyFiles,COPY_INCLUDES, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   321
    SRC := $(JDK_OUTPUTDIR)/include, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   322
    DEST := $(JDK_IMAGE_DIR)/include, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   323
    FILES := $(call CacheFind,$(JDK_OUTPUTDIR)/include)))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   324
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   325
JDK_TARGETS += $(COPY_INCLUDES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   326
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   327
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   328
# doc files
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   329
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   330
JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   331
JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   332
JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   333
JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   334
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   335
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   336
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   337
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   338
# Processing license files from source area to image area
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   339
# These are modified to have the platform specific EOL chars.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   340
define process-doc-file
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   341
	$(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   342
	$(MKDIR) -p $(@D)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   343
	$(RM) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   344
	LC_ALL=C $(SED) 's/$$//g' $< > $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   345
	$(CHMOD) 444 $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   346
endef
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   347
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   348
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   349
	$(process-doc-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   350
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   351
$(JDK_IMAGE_DIR)/%: $(JDK_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
JRE_TARGETS += $(JRE_DOC_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   355
JDK_TARGETS += $(JDK_DOC_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   356
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   357
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   358
# src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   359
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   360
$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   361
	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   362
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   363
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   364
JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   365
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   366
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   367
# /demo dir
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   368
ifneq ($(findstring images, $(MAKECMDGOALS)), )
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   369
  $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   370
      SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   371
      DEST := $(JDK_IMAGE_DIR)/demo, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   372
      FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   373
          $(call DoubleDollar, $(call DoubleDollar, \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   374
      $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   375
          -type f -a ! \( -name "_the*" -o -name "javac_state" \) )))), \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   376
  ))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   377
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   378
  JDK_TARGETS += $(JDK_COPY_DEMOS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   379
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   380
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   381
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   382
# /sample dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   383
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   384
$(eval $(call SetupCopyFiles,COPY_SAMPLES, \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   385
    SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   386
    DEST := $(JDK_IMAGE_DIR)/sample, \
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   387
    FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
481585782338 8081814: Modularize the deploy build
erikj
parents: 31308
diff changeset
   388
        $(call CacheFind,$(SUPPORT_OUTPUTDIR)/sample/image))))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   389
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   390
JDK_TARGETS += $(COPY_SAMPLES)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   391
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   392
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   393
# jrt-fs.jar
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   394
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   395
$(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   396
    SRC := $(SUPPORT_OUTPUTDIR), \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   397
    DEST := $(JDK_IMAGE_DIR), \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   398
    FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   399
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   400
JDK_TARGETS += $(COPY_JRTFS_JAR)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   401
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   402
################################################################################
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   403
# Code coverage data files
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   404
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   405
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   406
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   407
  GCOV_FIND_EXPR := -type f -name "*.gcno"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   408
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   409
  $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   410
      SRC := $(OUTPUT_ROOT), \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   411
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   412
      FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   413
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   414
  SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   415
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   416
  $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   417
      SRC := $(OUTPUT_ROOT), \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   418
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   419
      FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   420
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   421
  SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   422
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   423
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   424
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   425
################################################################################
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   426
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   427
# Include custom post hook here to make it possible to augment the target lists
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   428
# before actual target prerequisites are declared.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   429
$(eval $(call IncludeCustomExtension, , Images-post.gmk))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   430
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   431
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   432
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   433
$(JRE_TARGETS): $(TOOL_JRE_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   434
$(JDK_TARGETS): $(TOOL_JDK_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   435
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   436
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
   437
    $(SYMBOLS_TARGETS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   438
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   439
$(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   440
$(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   441
$(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   442
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   443
profiles: $(TOOL_JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   444
    $(TOOL_JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   445
    $(TOOL_JRE_COMPACT3_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   446
    $(JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   447
    $(JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   448
    $(JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   449
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   450
.PHONY: default all jimages profiles