make/Images.gmk
author coleenp
Tue, 31 Oct 2017 11:55:09 -0400
changeset 47765 b7c7428eaab9
parent 47354 e8bda13da40b
child 47454 7a7bc84f4b6c
permissions -rw-r--r--
8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot Summary: Removed hotspot version of jvm*h and jni*h files. Reviewed-by: ihse, mchung, dholmes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     1
#
43176
1da1ffe0c6fd 8172527: Rename jdk.crypto.token to jdk.crypto.cryptoki
ascarpino
parents: 43043
diff changeset
     2
# Copyright (c) 2014, 2017, 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.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47253
diff changeset
    37
$(eval $(call IncludeCustomExtension, Images-pre.gmk))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    38
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    39
############################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    40
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    41
# All modules for the current target platform.
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    42
ALL_MODULES := $(call FindAllModules)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    43
36725
f458544b0d76 8153261: Clean up fix for JDK-8153217
erikj
parents: 36723
diff changeset
    44
$(eval $(call ReadImportMetaData))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    45
37978
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37865
diff changeset
    46
JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37865
diff changeset
    47
    $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
2614022b9fa5 8157348: Build fails with certain source configurations
erikj
parents: 37865
diff changeset
    48
JDK_MODULES += $(ALL_MODULES)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    49
42514
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    50
# Modules list for compact builds 
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    51
JRE_COMPACT1_MODULES := \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    52
    java.logging \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    53
    java.scripting \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    54
    jdk.localedata \
43176
1da1ffe0c6fd 8172527: Rename jdk.crypto.token to jdk.crypto.cryptoki
ascarpino
parents: 43043
diff changeset
    55
    jdk.crypto.cryptoki \
42514
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    56
    jdk.crypto.ec \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    57
    jdk.unsupported \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    58
    #
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    59
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    60
JRE_COMPACT2_MODULES := \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    61
    $(JRE_COMPACT1_MODULES) \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    62
    java.rmi \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    63
    java.sql \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    64
    java.xml \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    65
    jdk.xml.dom \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    66
    jdk.httpserver \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    67
    #
36543
a8ce27ddc757 8152197: Single place to specify module-specific information for images build
mchung
parents: 36506
diff changeset
    68
42514
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    69
JRE_COMPACT3_MODULES := \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    70
    $(JRE_COMPACT2_MODULES) \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    71
    java.smartcardio \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    72
    java.compiler \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    73
    java.instrument \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    74
    java.management \
43384
0a0861e1db57 8173607: JMX RMI connector should be in its own module
dfuchs
parents: 43176
diff changeset
    75
    java.management.rmi \
42514
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    76
    java.naming \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    77
    java.prefs \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    78
    java.security.jgss \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    79
    java.security.sasl \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    80
    java.sql.rowset \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    81
    java.xml.crypto \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    82
    jdk.management \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    83
    jdk.naming.dns \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    84
    jdk.naming.rmi \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    85
    jdk.sctp \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    86
    jdk.security.auth \
d5c5e07498ef 8171201: Drop java.compact$N aggregator modules
mchung
parents: 42505
diff changeset
    87
    #
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    88
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    89
JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    90
JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    91
JRE_COMPACT1_MODULES_LIST := $(call CommaList, $(JRE_COMPACT1_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    92
JRE_COMPACT2_MODULES_LIST := $(call CommaList, $(JRE_COMPACT2_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    93
JRE_COMPACT3_MODULES_LIST := $(call CommaList, $(JRE_COMPACT3_MODULES))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    94
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    95
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    96
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    97
BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    98
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    99
JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   100
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   101
# Use this file inside the image as target for make rule
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   102
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   103
38845
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   104
JLINK_ORDER_RESOURCES := **module-info.class
40612
cec3daf6324a 8164858: Enable build-time use of java.lang.invoke resolve tracing
redestad
parents: 40241
diff changeset
   105
JLINK_JLI_CLASSES :=
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   106
ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
41874
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod
erikj
parents: 41532
diff changeset
   107
  JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/link_opt/classlist
43783
35fe9d6f5075 8175026: Capture build-time parameters to --generate-jli-classes
redestad
parents: 43384
diff changeset
   108
  JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/link_opt/default_jli_trace.txt
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   109
endif
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   110
JLINK_ORDER_RESOURCES += \
38845
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   111
    /java.base/java/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   112
    /java.base/jdk/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   113
    /java.base/sun/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   114
    /java.base/com/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
   115
    /jdk.localedata/** \
37865
94ea10488f02 8156756: Enable build-time use of resource ordering plugin
redestad
parents: 37770
diff changeset
   116
    #
94ea10488f02 8156756: Enable build-time use of resource ordering plugin
redestad
parents: 37770
diff changeset
   117
42287
925cf8cf736c 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42286
diff changeset
   118
JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
925cf8cf736c 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42286
diff changeset
   119
    --module-path $(IMAGES_OUTPUTDIR)/jmods \
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   120
    --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   121
    --release-info $(BASE_RELEASE_FILE) \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   122
    --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
42505
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42293
diff changeset
   123
    --dedup-legal-notices=error-if-not-same-content \
40612
cec3daf6324a 8164858: Enable build-time use of java.lang.invoke resolve tracing
redestad
parents: 40241
diff changeset
   124
    $(JLINK_JLI_CLASSES) \
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
   125
    #
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   126
42140
a2ea75dd99dc 8170280: Enable -g for all java compilation in the build
erikj
parents: 41875
diff changeset
   127
JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files --strip-debug
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   128
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   129
ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   130
  JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
36506
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)
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   137
	$(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
41874
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod
erikj
parents: 41532
diff changeset
   138
	    $(JLINK_JDK_EXTRA_OPTS) \
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   139
	    --output $(JDK_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   140
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   141
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   142
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   143
    $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   144
	$(ECHO) Creating jre jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   145
	$(RM) -r $(JRE_IMAGE_DIR)
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   146
	$(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   147
	    $(JLINK_JRE_EXTRA_OPTS) \
41874
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod
erikj
parents: 41532
diff changeset
   148
	    --output $(JRE_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   149
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   150
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   151
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   152
$(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   153
    $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   154
	$(ECHO) Creating jre compact1 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   155
	$(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   156
	$(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   157
	    $(JLINK_JRE_EXTRA_OPTS) \
36506
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)
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   165
	$(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   166
	    $(JLINK_JRE_EXTRA_OPTS) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   167
	    --output $(JRE_COMPACT2_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   168
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   169
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   170
$(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   171
    $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   172
	$(ECHO) Creating jre compact3 jimage
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   173
	$(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
40241
59abac94e4f2 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 39954
diff changeset
   174
	$(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
   175
	    $(JLINK_JRE_EXTRA_OPTS) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   176
	    --output $(JRE_COMPACT3_IMAGE_DIR)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   177
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   178
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   179
TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   180
TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   181
TOOL_JRE_COMPACT1_TARGETS := $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   182
TOOL_JRE_COMPACT2_TARGETS := $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   183
TOOL_JRE_COMPACT3_TARGETS := $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   184
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   185
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   186
# /man dir
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   187
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   188
# All variables in this section are assigned with simple =, without :, to enable
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   189
# more selective overriding from the custom version of this file.
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   190
#
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   191
# Avoid evaluating this whole section on windows for speed and stability
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   192
ifneq ($(OPENJDK_TARGET_OS), windows)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   193
  JRE_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   194
      java.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   195
      jjs.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   196
      keytool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   197
      orbd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   198
      pack200.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   199
      rmid.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   200
      rmiregistry.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   201
      servertool.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   202
      tnameserv.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   203
      unpack200.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   204
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   205
  JDK_MAN_PAGES += \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   206
      $(JRE_MAN_PAGES) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   207
      appletviewer.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   208
      idlj.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   209
      jar.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   210
      jarsigner.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   211
      javac.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   212
      javadoc.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   213
      javah.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   214
      javap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   215
      jconsole.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   216
      jcmd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   217
      jdb.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   218
      jdeps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   219
      jinfo.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   220
      jmap.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   221
      jps.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   222
      jrunscript.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   223
      jstack.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   224
      jstat.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   225
      jstatd.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   226
      rmic.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   227
      schemagen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   228
      serialver.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   229
      wsgen.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   230
      wsimport.1 \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   231
      xjc.1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   232
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   233
  # This variable is potentially overridden in the closed makefile.
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 44729
diff changeset
   234
  MAN_SRC_BASEDIR ?= $(TOPDIR)/src
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   235
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   236
  ifeq ($(OPENJDK_TARGET_OS), linux)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   237
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   238
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   239
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   240
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   241
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   242
    MAN1_SUBDIR = sun/man/man1
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   243
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   244
  ifeq ($(OPENJDK_TARGET_OS), macosx)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   245
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   246
    MAN1_SUBDIR = man
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   247
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   248
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   249
  $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   250
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   251
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   252
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   253
  $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   254
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   255
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   256
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   257
  $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   258
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
30093
c8c926543552 8077992: Eliminate JDK build dependency of native2ascii and update Japanese nroff man pages to UTF-8 encoding
ihse
parents: 30091
diff changeset
   259
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   260
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   261
  $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   262
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
30093
c8c926543552 8077992: Eliminate JDK build dependency of native2ascii and update Japanese nroff man pages to UTF-8 encoding
ihse
parents: 30091
diff changeset
   263
	$(install-file)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   264
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   265
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   266
    $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   267
	$(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   268
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   269
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   270
    $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   271
	$(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   272
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   273
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   274
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   275
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   276
    $(JRE_IMAGE_DIR)/man/ja:
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   277
	$(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   278
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   279
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   280
    $(JDK_IMAGE_DIR)/man/ja:
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   281
	$(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   282
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   283
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   284
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   285
  ifeq ($(OPENJDK_TARGET_OS), solaris)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   286
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   287
        $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   288
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   289
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   290
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   291
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   292
        $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   293
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   294
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   295
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   296
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   297
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   298
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   299
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   300
        $(JRE_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   301
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   302
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   303
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   304
        $(JDK_IMAGE_DIR)/man/ja
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   305
  endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   306
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   307
  JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   308
  JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   309
endif # Windows
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   310
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   311
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   312
# src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   313
42523
0aeacf92b0f8 8170428: Move src.zip to JDK/lib/src.zip
mchung
parents: 42286
diff changeset
   314
$(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   315
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
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
42523
0aeacf92b0f8 8170428: Move src.zip to JDK/lib/src.zip
mchung
parents: 42286
diff changeset
   318
JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   319
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   320
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   321
# /demo dir
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   322
# Avoid doing the expensive find unless called with "jdk" as target.
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   323
ifneq ($(filter jdk, $(MAKECMDGOALS)), )
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   324
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   325
  DEMO_FILES := \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   326
      $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   327
        $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
47354
e8bda13da40b 8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents: 47314
diff changeset
   328
            -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   329
      )
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   330
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   331
  ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   332
    ifeq ($(OPENJDK_TARGET_OS), macosx)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   333
      DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   334
    else
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   335
      DEMO_FILES := $(filter-out %.debuginfo %.pdb %.map, $(DEMO_FILES))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   336
    endif
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   337
  endif
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   338
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   339
  $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   340
      SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   341
      DEST := $(JDK_IMAGE_DIR)/demo, \
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   342
      FILES := $(DEMO_FILES), \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   343
  ))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   344
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   345
  JDK_TARGETS += $(JDK_COPY_DEMOS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   346
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   347
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   348
################################################################################
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   349
# Code coverage data files
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   350
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   351
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   352
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   353
  GCOV_FIND_EXPR := -type f -name "*.gcno"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   354
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   355
  $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   356
      SRC := $(OUTPUTDIR), \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   357
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   358
      FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   359
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   360
  SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   361
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   362
  $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   363
      SRC := $(OUTPUTDIR), \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   364
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   365
      FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   366
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   367
  SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   368
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   369
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   370
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   371
################################################################################
37653
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   372
# Debug symbols
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   373
# Since debug symbols are not included in the jmod files, they need to be copied
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   374
# in manually after generating the images.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   375
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   376
ALL_JDK_MODULES := $(JDK_MODULES)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   377
ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   378
    $(call FindTransitiveDepsForModule, $m)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   379
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   380
ifeq ($(OPENJDK_TARGET_OS), windows)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   381
  LIBS_TARGET_SUBDIR := bin
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   382
else
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   383
  LIBS_TARGET_SUBDIR := lib
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   384
endif
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   385
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   386
# Param 1 - dir to find debuginfo files in
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   387
FindDebuginfoFiles = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   388
    $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   389
        $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   390
        $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   391
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   392
# Pick the correct debug info files to copy, either zipped or not.
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   393
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   394
  DEBUGINFO_SUFFIXES += .diz
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   395
else
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   396
  DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   397
  # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   398
  # dirs.
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   399
  ifeq ($(OPENJDK_TARGET_OS), macosx)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   400
    $(eval $(call FillCacheFind, \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   401
        $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   402
    FindDebuginfoFiles = \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   403
        $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   404
  endif
37653
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   405
endif
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   406
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   407
# Param 1 - either JDK or JRE
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   408
SetupCopyDebuginfo = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   409
    $(foreach m, $(ALL_$1_MODULES), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   410
      $(eval $(call SetupCopyFiles, COPY_$1_LIBS_DEBUGINFO_$m, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   411
          SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$m, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   412
          DEST := $($1_IMAGE_DIR)/$(LIBS_TARGET_SUBDIR), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   413
          FILES := $(call FindDebuginfoFiles, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   414
              $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   415
      )) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   416
      $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   417
    )
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   418
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   419
# No space before argument to avoid having to put $(strip ) everywhere in
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   420
# implementation above.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   421
$(call SetupCopyDebuginfo,JDK)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   422
$(call SetupCopyDebuginfo,JRE)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   423
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   424
################################################################################
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   425
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   426
# Include custom post hook here to make it possible to augment the target lists
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   427
# before actual target prerequisites are declared.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47253
diff changeset
   428
$(eval $(call IncludeCustomExtension, Images-post.gmk))
27560
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
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   432
$(JRE_TARGETS): $(TOOL_JRE_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   433
$(JDK_TARGETS): $(TOOL_JDK_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   434
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   435
jdk: $(JDK_TARGETS)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   436
jre: $(JRE_TARGETS)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   437
symbols: $(SYMBOLS_TARGETS)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   438
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   439
all: jdk jre symbols
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   440
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   441
$(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   442
$(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   443
$(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   444
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   445
profiles: $(TOOL_JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   446
    $(TOOL_JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   447
    $(TOOL_JRE_COMPACT3_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   448
    $(JRE_COMPACT1_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   449
    $(JRE_COMPACT2_TARGETS) \
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   450
    $(JRE_COMPACT3_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   451
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   452
.PHONY: default all jdk jre symbols profiles