make/Images.gmk
author henryjen
Fri, 30 Nov 2018 13:42:49 -0800
changeset 52788 241b8151b6b6
parent 52714 2e52aa822c57
child 52983 7b4f2f7376fe
child 57049 d13c49f43710
permissions -rw-r--r--
8213362: [macOS] Could not find libjava.dylib error when initializing JVM via JNI_CreateJavaVM Reviewed-by: alanb, ihse Contributed-by: priyanka.mangal@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
     1
#
48841
0937e5f799df 8190378: Removal of CORBA and Java EE modules
lancea
parents: 48406
diff changeset
     2
# Copyright (c) 2014, 2018, 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
37770
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    50
JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
9f040cf69078 8150044: Generate classlists at build-time
redestad
parents: 37653
diff changeset
    51
JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    52
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    53
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    54
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    55
BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    56
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    57
JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    58
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    59
# Use this file inside the image as target for make rule
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    60
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
    61
38845
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
    62
JLINK_ORDER_RESOURCES := **module-info.class
40612
cec3daf6324a 8164858: Enable build-time use of java.lang.invoke resolve tracing
redestad
parents: 40241
diff changeset
    63
JLINK_JLI_CLASSES :=
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
    64
ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
41874
07c3c4f1eb63 8168108: lib/classlist should be packaged in java.base.jmod
erikj
parents: 41532
diff changeset
    65
  JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/link_opt/classlist
43783
35fe9d6f5075 8175026: Capture build-time parameters to --generate-jli-classes
redestad
parents: 43384
diff changeset
    66
  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
    67
endif
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
    68
JLINK_ORDER_RESOURCES += \
38845
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
    69
    /java.base/java/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
    70
    /java.base/jdk/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
    71
    /java.base/sun/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
    72
    /java.base/com/** \
6d03072cdab8 8158402: jlink: should use regex for all pattern operations (--order-resources or --exclude-resources)
jlaskey
parents: 38546
diff changeset
    73
    /jdk.localedata/** \
37865
94ea10488f02 8156756: Enable build-time use of resource ordering plugin
redestad
parents: 37770
diff changeset
    74
    #
94ea10488f02 8156756: Enable build-time use of resource ordering plugin
redestad
parents: 37770
diff changeset
    75
42287
925cf8cf736c 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42286
diff changeset
    76
JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
925cf8cf736c 8160359: Improve jlink logging for cases when a plugin throws exception
sundar
parents: 42286
diff changeset
    77
    --module-path $(IMAGES_OUTPUTDIR)/jmods \
49886
22d36f1c0994 8202210: jlink uses little-endian for big-endian cross-compilation targets
shade
parents: 48912
diff changeset
    78
    --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
    79
    --release-info $(BASE_RELEASE_FILE) \
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
    80
    --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
    81
    --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
    82
    $(JLINK_JLI_CLASSES) \
38546
91a5c3430d4f 8157336: Generation of classlists at build time should be configurable
erikj
parents: 37978
diff changeset
    83
    #
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    84
42140
a2ea75dd99dc 8170280: Enable -g for all java compilation in the build
erikj
parents: 41875
diff changeset
    85
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
    86
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    87
ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
41532
76dffc133464 8167558: Add new JMOD section for header files and man pages
mchung
parents: 41458
diff changeset
    88
  JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    89
endif
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    90
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    91
$(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    92
    $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
52030
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
    93
	$(call LogWarn, Creating jdk image)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
    94
	$(RM) -r $(JDK_IMAGE_DIR)
48912
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
    95
	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jdk, \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
    96
	    $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
    97
	        $(JLINK_JDK_EXTRA_OPTS) \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
    98
	        --output $(JDK_IMAGE_DIR) \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
    99
	)
52030
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   100
        ifeq ($(BUILD_CDS_ARCHIVE), true)
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   101
	  $(call LogWarn, Creating CDS archive for jdk image)
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   102
	  $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO)
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   103
        endif
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   104
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   105
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   106
$(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   107
    $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
52030
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   108
	$(call LogWarn, Creating legacy jre image)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 36284
diff changeset
   109
	$(RM) -r $(JRE_IMAGE_DIR)
48912
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
   110
	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre, \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
   111
	    $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
   112
	        $(JLINK_JRE_EXTRA_OPTS) \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
   113
	        --output $(JRE_IMAGE_DIR) \
01237b276b8b 8198318: Make build comparisons clean again
ihse
parents: 48841
diff changeset
   114
	)
52030
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   115
        ifeq ($(BUILD_CDS_ARCHIVE), true)
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   116
	  $(call LogWarn, Creating CDS archive for jre image)
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   117
	  $(JRE_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO)
57862a02bf4b 8202951: Implementation of JEP 341: Default CDS Archives
jiangli
parents: 51215
diff changeset
   118
        endif
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   119
	$(TOUCH) $@
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   120
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   121
TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   122
TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   123
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   124
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   125
# src.zip
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   126
42523
0aeacf92b0f8 8170428: Move src.zip to JDK/lib/src.zip
mchung
parents: 42286
diff changeset
   127
$(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
   128
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   129
	$(install-file)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   130
42523
0aeacf92b0f8 8170428: Move src.zip to JDK/lib/src.zip
mchung
parents: 42286
diff changeset
   131
JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   132
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   133
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   134
# /demo dir
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   135
# 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
   136
ifneq ($(filter jdk, $(MAKECMDGOALS)), )
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   137
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   138
  DEMO_FILES := \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   139
      $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   140
        $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
47354
e8bda13da40b 8189434: SetupCopyFiles does not handle files with $ in them
erikj
parents: 47314
diff changeset
   141
            -type f -a ! \( -name "_the*" -o -name "javac_state" \) ) \
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   142
      )
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   143
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   144
  ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   145
    ifeq ($(OPENJDK_TARGET_OS), macosx)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   146
      DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   147
    else
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   148
      DEMO_FILES := $(filter-out %.debuginfo %.pdb %.map, $(DEMO_FILES))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   149
    endif
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   150
  endif
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   151
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   152
  $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   153
      SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   154
      DEST := $(JDK_IMAGE_DIR)/demo, \
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   155
      FILES := $(DEMO_FILES), \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   156
  ))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   157
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34120
diff changeset
   158
  JDK_TARGETS += $(JDK_COPY_DEMOS)
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   159
endif
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   160
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   161
################################################################################
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   162
# Code coverage data files
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   163
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   164
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   165
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   166
  GCOV_FIND_EXPR := -type f -name "*.gcno"
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   167
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   168
  $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   169
      SRC := $(OUTPUTDIR), \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   170
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   171
      FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   172
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   173
  SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   174
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   175
  $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47224
diff changeset
   176
      SRC := $(OUTPUTDIR), \
29444
b6186ae3a799 8075236: Change layout of gcov .gcno files in symbols image
erikj
parents: 29305
diff changeset
   177
      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   178
      FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   179
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   180
  SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   181
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   182
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   183
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 29303
diff changeset
   184
################################################################################
37653
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   185
# Debug symbols
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   186
# 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
   187
# in manually after generating the images.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   188
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   189
ALL_JDK_MODULES := $(JDK_MODULES)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   190
ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   191
    $(call FindTransitiveDepsForModule, $m)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   192
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   193
ifeq ($(OPENJDK_TARGET_OS), windows)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   194
  LIBS_TARGET_SUBDIR := bin
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   195
else
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   196
  LIBS_TARGET_SUBDIR := lib
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   197
endif
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   198
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   199
# Param 1 - dir to find debuginfo files in
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   200
FindDebuginfoFiles = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   201
    $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   202
        $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   203
        $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   204
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   205
# 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
   206
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   207
  DEBUGINFO_SUFFIXES += .diz
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   208
else
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   209
  DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   210
  # 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
   211
  # dirs.
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   212
  ifeq ($(OPENJDK_TARGET_OS), macosx)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   213
    $(eval $(call FillCacheFind, \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   214
        $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   215
    FindDebuginfoFiles = \
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   216
        $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   217
  endif
37653
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   218
endif
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   219
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   220
# Param 1 - either JDK or JRE
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   221
SetupCopyDebuginfo = \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   222
    $(foreach m, $(ALL_$1_MODULES), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   223
      $(eval $(call SetupCopyFiles, COPY_$1_LIBS_DEBUGINFO_$m, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   224
          SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$m, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   225
          DEST := $($1_IMAGE_DIR)/$(LIBS_TARGET_SUBDIR), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   226
          FILES := $(call FindDebuginfoFiles, \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   227
              $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   228
      )) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   229
      $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   230
    )
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   231
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   232
# No space before argument to avoid having to put $(strip ) everywhere in
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   233
# implementation above.
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   234
$(call SetupCopyDebuginfo,JDK)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   235
$(call SetupCopyDebuginfo,JRE)
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   236
3aff5316640d 8155632: Remove debuginfo from jmod files
erikj
parents: 36725
diff changeset
   237
################################################################################
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   238
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   239
# Include custom post hook here to make it possible to augment the target lists
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   240
# before actual target prerequisites are declared.
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47253
diff changeset
   241
$(eval $(call IncludeCustomExtension, Images-post.gmk))
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   242
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   243
################################################################################
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   244
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   245
$(JRE_TARGETS): $(TOOL_JRE_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   246
$(JDK_TARGETS): $(TOOL_JDK_TARGETS)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   247
47454
7a7bc84f4b6c 8189618: [aix] No jre image is created during images step
mbaesken
parents: 47354
diff changeset
   248
jdk: $(TOOL_JDK_TARGETS) $(JDK_TARGETS)
7a7bc84f4b6c 8189618: [aix] No jre image is created during images step
mbaesken
parents: 47354
diff changeset
   249
jre: $(TOOL_JRE_TARGETS) $(JRE_TARGETS)
41260
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   250
symbols: $(SYMBOLS_TARGETS)
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   251
4f71f07b30d1 8150736: Excessive disk space used by build system
erikj
parents: 40843
diff changeset
   252
all: jdk jre symbols
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents:
diff changeset
   253
49979
b70281f5146e 8196113: Remove the Compact Profile builds
erikj
parents: 49886
diff changeset
   254
.PHONY: default all jdk jre symbols