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