jdk/makefiles/Images.gmk
author duke
Wed, 05 Jul 2017 18:46:58 +0200
changeset 16416 bcebd3fdefc9
parent 16127 2b9ee77336a8
child 16511 a059e818459d
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
include $(SPEC)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
include MakeBase.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
include JavaCompilation.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
include Setup.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    31
default: images
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    33
# Prepare the find cache. Only used if running on windows.
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    34
$(eval $(call FillCacheFind,\
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    35
    $(wildcard $(JDK_OUTPUTDIR)/bin \
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    36
               $(JDK_OUTPUTDIR)/lib \
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    37
               $(IMAGES_OUTPUTDIR)/lib \
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    38
               $(JDK_OUTPUTDIR)/include \
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    39
               $(JDK_OUTPUTDIR)/sample \
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    40
               $(JDK_OUTPUTDIR)/demo)))
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    41
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
include Tools.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    44
include Profiles.gmk
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    45
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    46
# Note: This double-colon rule is intentional, to support
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    47
# custom make file integration.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    48
images:: jre-image jdk-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    49
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    50
overlay-images: jre-overlay-image jdk-overlay-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    51
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    52
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    53
-include $(CUSTOM_MAKE_DIR)/Images.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    54
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    56
# Processing license files from source area to image area
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    57
# These will be modified to have the platform specific EOL chars.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    58
define process-doc-file
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    59
	$(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    60
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    61
	$(RM) $@
15823
9882cddb33b9 8007387: "sed: RE error: illegal byte sequence" when building images on Mac
erikj
parents: 15693
diff changeset
    62
	LC_ALL=C $(SED) 's/$$//g' $< > $@
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    63
	$(CHMOD) 444 $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    64
endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    65
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    66
define AddFileToCopy
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    67
  # Param 1 - src root dir
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    68
  # Param 2 - dest root dir
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    69
  # Param 3 - src file
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    70
  # Param 4 - variable to add targets to
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    71
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    72
  # Remove src dir root from src file
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    73
  $2_$3_FILE := $$(patsubst $1/%,%,$3)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    74
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    75
  $2/$$($2_$3_FILE): $3
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    76
	$(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    77
	$$(install-file)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    78
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    79
  $4 += $2/$$($2_$3_FILE)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    80
endef
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    81
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    82
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    83
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    84
# JRE and JDK build rules
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    85
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    86
################################################################################
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    87
#
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    88
# Variable prefixes explained:
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    89
# JRE_ refers to files in the j2re-*-image.
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    90
# JDK_ refers to files in the j2sdk-image outside of the jre subdir.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    91
# JDKJRE_ refers to files in the j2sdk-image inside the jre subdir.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    92
#
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    93
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    94
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    95
# /bin dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    96
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    97
ifeq ($(PROFILE),)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    98
    NOT_JRE_BIN_FILES := \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    99
	appletviewer$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   100
	extcheck$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   101
	idlj$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   102
	jar$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   103
	jarsigner$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   104
	java-rmi.cgi \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   105
	javac$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   106
	javadoc$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   107
	javah$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   108
	javap$(EXE_SUFFIX) \
14994
a544909d1d1c 8003562: Provide a CLI tool to analyze class dependencies
mchung
parents: 14596
diff changeset
   109
	jdeps$(EXE_SUFFIX) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   110
	jcmd$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   111
	jdb$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   112
	jps$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   113
	jrunscript$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   114
	jstat$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   115
	jstatd$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   116
	jstack$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   117
	packagebean$(SCRIPT_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   118
	rmic$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   119
	serialver$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   120
	unregbean$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   121
	jconsole$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   122
	jinfo$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   123
	jmap$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   124
	native2ascii$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   125
	xjc$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   126
	wsgen$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   127
	wsimport$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   128
        schemagen$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   129
	jsadebugd$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   130
	jhat$(EXE_SUFFIX)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   131
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   132
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   133
WINDOWS_JDK_BIN_FILES = \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   134
	$(EXE_SUFFIX) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   135
	$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   136
	$(notdir $(MSVCR_DLL))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   137
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   138
WINDOWS_JDKJRE_BIN_FILES := \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   139
	$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   140
	$(SALIB_NAME)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   141
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   142
# Find all files in bin dir
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   143
ALL_BIN_LIST := $(call CacheFind,$(JDK_OUTPUTDIR)/bin)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   144
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   145
# Prevent sjavac from entering the images.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   146
ALL_BIN_LIST := $(filter-out %/sjavac,$(ALL_BIN_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   147
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   148
# For unknown reason the debuginfo files for executables are not put into images
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   149
# e.g filter them out
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   150
ifneq ($(OPENJDK_TARGET_OS),windows)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   151
    ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   152
else
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   153
# On windows, the libraries are in the bin dir, only filter out debuginfo files
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   154
# for executables. "java" is both a library and executable.
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   155
    ALL_BIN_EXEC_FILES := $(filter-out java.exe,$(notdir $(filter %.exe,$(ALL_BIN_LIST))))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   156
    ALL_BIN_DEBUG_FILTER := $(addprefix %,$(patsubst %.exe,%.debuginfo,$(ALL_BIN_EXEC_FILES)) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   157
					   $(patsubst %.exe,%.diz,$(ALL_BIN_EXEC_FILES))) %.pdb
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   158
    ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER),$(ALL_BIN_LIST))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   159
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   160
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   161
JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   162
JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   163
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   164
ifeq ($(OPENJDK_TARGET_OS),windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   165
    JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   166
    # On windows x86, the server jvm is filtered out from the j2re image. This could possibly 
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   167
    # be handled by profiles in the future. If no client jvm is built, leave server in.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   168
    ifeq ($(OPENJDK_TARGET_CPU),x86)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   169
        ifeq ($(JVM_VARIANT_CLIENT),true)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   170
            JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%,$(JRE_BIN_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   171
	endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   172
    endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   173
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   174
    JDK_BIN_LIST := $(ALL_BIN_LIST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   175
endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   176
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   177
ifneq ($(OPENJDK_TARGET_CPU_ISADIR),)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   178
    OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   179
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   180
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   181
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   182
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   183
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   184
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   185
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   186
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   187
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   188
$(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   189
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   190
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   191
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   192
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   193
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   194
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   195
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   196
# /lib dir
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   197
ifneq ($(OPENJDK_TARGET_OS), macosx)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   198
    JDKJRE_LIB_FILES := \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   199
	$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   200
	$(SALIB_NAME)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   201
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   202
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   203
ifeq ($(PROFILE),)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   204
    NOT_JRE_LIB_FILES := \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   205
	tools.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   206
	jconsole.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   207
	sa-jdi.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   208
	dt.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   209
	orb.idl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   210
	ir.idl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   211
	ct.sym
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   212
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   213
    ifeq ($(OPENJDK_TARGET_OS), windows)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   214
      NOT_JRE_LIB_FILES += jawt.lib jvm.lib
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   215
    endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   216
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   217
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   218
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   219
ifeq ($(OPENJDK_TARGET_OS), linux)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   220
    JDK_LIB_FILES += jexec
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   221
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   222
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   223
# Find all files to copy from $(JDK_OUTPUTDIR)/lib
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14231
diff changeset
   224
# Jar files are not expected to be here
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   225
ALL_JDKOUT_LIB_LIST := $(call not-containing,_the.,$(filter-out %.jar,\
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   226
                            $(call CacheFind,$(JDK_OUTPUTDIR)/lib)))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   227
# Find all files to copy from $(IMAGES_OUTPUTDIR)/lib
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14231
diff changeset
   228
# This is were the jar files are and might not exist if building overlay-images
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   229
ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib),)
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   230
    ALL_IMAGES_LIB_LIST := $(call not-containing,_the.,\
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   231
                            $(call CacheFind,$(IMAGES_OUTPUTDIR)/lib))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   232
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   233
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   234
# Filter files to copy for each destination
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   235
JRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   236
                       $(ALL_JDKOUT_LIB_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   237
JDKJRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   238
JDK_JDKOUT_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   239
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   240
JRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   241
                       $(ALL_IMAGES_LIB_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   242
JDKJRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_IMAGES_LIB_LIST))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   243
JDK_IMAGES_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_IMAGES_LIB_LIST))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   244
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   245
# Iterate over files to copy to create rules for each one
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   246
$(foreach f,$(JRE_JDKOUT_LIB_LIST),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   247
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   248
$(foreach f,$(JDK_JDKOUT_LIB_LIST),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   249
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   250
$(foreach f,$(JDKJRE_JDKOUT_LIB_LIST),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   251
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   252
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   253
$(foreach f,$(JRE_IMAGES_LIB_LIST),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   254
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   255
$(foreach f,$(JDK_IMAGES_LIB_LIST),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   256
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   257
$(foreach f,$(JDKJRE_IMAGES_LIB_LIST),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   258
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   259
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   260
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   261
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   262
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   263
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   264
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)),\
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   265
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   266
15885
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   267
ifneq ($(PROFILE),)
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   268
# Files in lib$(PROFILE) are excluded from the generic copying routines so 
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   269
# we have to add them back in here
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   270
$(foreach f,$(CUSTOM_PROFILE_JARS),\
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   271
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS)))
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   272
endif
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   273
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   274
# CTE plugin security change require new empty directory lib/applet
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   275
$(JRE_IMAGE_DIR)/lib/applet: 
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   276
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   277
	$(MKDIR) -p $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   278
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   279
$(JDK_IMAGE_DIR)/jre/lib/applet: 
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   280
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   281
	$(MKDIR) -p $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   282
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   283
# In the old build, JObjC.jar is not part of the meta-index
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   284
$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   285
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   286
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   287
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   288
$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   289
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   290
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   291
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   292
$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   293
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   294
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   295
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   296
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   297
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   298
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   299
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   300
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   301
# /man dir
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   302
# Avoid evaluating this whole section on windows for speed and stability
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   303
ifneq ($(OPENJDK_TARGET_OS),windows)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   304
    JRE_MAN_PAGES := \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   305
	java.1		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   306
	keytool.1	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   307
	orbd.1          \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   308
	pack200.1	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   309
	policytool.1    \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   310
	rmid.1		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   311
	rmiregistry.1	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   312
	servertool.1    \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   313
	tnameserv.1     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   314
	unpack200.1
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   315
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   316
    ifndef OPENJDK
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   317
        JRE_MAN_PAGES += javaws.1
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   318
    endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   319
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   320
    JDK_MAN_PAGES =        \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   321
	$(JRE_MAN_PAGES)   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   322
	appletviewer.1     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   323
	extcheck.1         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   324
	idlj.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   325
	jar.1              \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   326
	jarsigner.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   327
	javac.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   328
	javadoc.1          \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   329
	javah.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   330
	javap.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   331
	jconsole.1         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   332
	jcmd.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   333
	jdb.1              \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   334
	jhat.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   335
        jinfo.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   336
        jmap.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   337
        jps.1              \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   338
	jrunscript.1       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   339
        jsadebugd.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   340
        jstack.1           \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   341
        jstat.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   342
        jstatd.1           \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   343
	native2ascii.1     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   344
	rmic.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   345
        schemagen.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   346
	serialver.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   347
        wsgen.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   348
        wsimport.1         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   349
        xjc.1
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   350
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   351
    ifndef OPENJDK
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   352
        JDK_MAN_PAGES += jvisualvm.1
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   353
    endif
13497
2c09fb7cdf7f 7192804: Build should not install jvisualvm man page for OpenJDK
andrew
parents: 13164
diff changeset
   354
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   355
    ifeq ($(OPENJDK_TARGET_OS), linux)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   356
        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   357
        MAN1_SUBDIR:=man
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   358
    endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   359
    ifeq ($(OPENJDK_TARGET_OS), solaris)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   360
        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   361
        MAN1_SUBDIR:=sun/man/man1
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   362
    endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   363
    ifeq ($(OPENJDK_TARGET_OS), macosx)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   364
        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/bsd/doc
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   365
        MAN1_SUBDIR:=man
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   366
        JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   367
        JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   368
    endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   369
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   370
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   371
    $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   372
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   373
	$(install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   374
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   375
    $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   376
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   377
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   378
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   379
    $(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   380
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   381
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   382
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   383
    $(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   384
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   385
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   386
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   387
    define install-ja-manpage
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   388
	$(MKDIR) -p $(@D)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   389
	$(CAT) $< \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   390
		| $(NATIVE2ASCII) -encoding eucJP \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   391
		| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   392
		| $(NATIVE2ASCII) -reverse -encoding $1 \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   393
		> $@
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   394
    endef
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   395
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   396
    $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   397
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   398
	$(call install-ja-manpage,UTF-8)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   399
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   400
    $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   401
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   402
	$(call install-ja-manpage,UTF-8)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   403
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   404
    $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   405
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   406
	$(call install-ja-manpage,PCK)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   407
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   408
    $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   409
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   410
	$(call install-ja-manpage,PCK)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   411
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   412
    ifeq ($(OPENJDK_TARGET_OS), solaris)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   413
        $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   414
		$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   415
		$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   416
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   417
        $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   418
		$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   419
		$(install-file)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   420
    endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   421
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   422
    # Old build creates empty man page for this, mimicing behaviour.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   423
    $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja/man1/jcmd.1:
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   424
	$(ECHO) $(LOG_INFO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   425
	$(MKDIR) -p $(@D)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   426
	$(TOUCH) $@
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   427
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   428
    ifeq ($(OPENJDK_TARGET_OS), linux)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   429
        $(JRE_IMAGE_DIR)/man/ja:
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   430
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   431
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   432
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   433
        $(JDK_IMAGE_DIR)/man/ja:
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   434
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   435
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   436
    endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   437
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   438
    ifeq ($(OPENJDK_TARGET_OS), macosx)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   439
        $(JRE_IMAGE_DIR)/man/ja:
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   440
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   441
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   442
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   443
        $(JDK_IMAGE_DIR)/man/ja:
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   444
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   445
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   446
    endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   447
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   448
    ifeq ($(OPENJDK_TARGET_OS), linux)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   449
        JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   450
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   451
                             $(JRE_IMAGE_DIR)/man/ja
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   452
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   453
        JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   454
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   455
                             $(JDK_IMAGE_DIR)/man/ja
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   456
    endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   457
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   458
    ifeq ($(OPENJDK_TARGET_OS), solaris)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   459
        JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   460
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   461
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   462
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JRE_MAN_PAGES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   463
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   464
        JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   465
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   466
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   467
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   468
    endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   469
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   470
    ifeq ($(OPENJDK_TARGET_OS), macosx)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   471
        JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   472
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   473
                             $(JRE_IMAGE_DIR)/man/ja
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   474
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   475
        JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   476
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   477
                             $(JDK_IMAGE_DIR)/man/ja
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   478
    endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   479
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   480
endif # Windows
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   481
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   482
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   483
# /demo dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   484
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   485
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   486
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   487
#   The db demo contains an empty dir that needs to be copied. The other 
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   488
#   directories will always trigger the rule for recompile since 
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   489
#   _the.list_of_packages files are touched.
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   490
$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   491
	if [ ! -d "$@" ]; then \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   492
	  $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   493
	  $(MKDIR) -p $(@D); \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   494
	  if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   495
	fi
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   496
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   497
#   Find all files including directories
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   498
JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   499
			$(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   500
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   501
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   502
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   503
# Param 1 is source file
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   504
define CreateOverlayDemoRule
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   505
    $1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   506
			$$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   507
    $$($1_TARGET): $1
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   508
		$(ECHO) $(LOG_INFO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   509
		$$(call install-file)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   510
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   511
    JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   512
endef
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   513
JDK_OVERLAY_DEMO_SOURCES := $(filter %$(SHARED_LIBRARY_SUFFIX),$(call CacheFind,$(JDK_OUTPUTDIR)/demo))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   514
$(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib))))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   515
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   516
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   517
# /sample dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   518
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   519
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/sample),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   520
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   521
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   522
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   523
# /db dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   524
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   525
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   526
    $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   527
	$(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   528
	$(MKDIR) -p $(JDK_IMAGE_DIR)/db
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   529
	cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x index.html 2> /dev/null
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   530
	$(MKDIR) -p $(@D)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   531
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   532
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   533
    $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   534
	$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   535
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   536
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   537
    JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   538
			$(call not-containing,demo,$(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip))) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   539
		      $(JDK_IMAGE_DIR)/db/README-JDK.html
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   540
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   541
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   542
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   543
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   544
# /include dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   545
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   546
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/include),\
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   547
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_INCLUDE_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   548
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   549
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   550
# doc files
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   551
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   552
ifdef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   553
    JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   554
    JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   555
    JRE_DOC_LOCATION := $(JDK_TOPDIR)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   556
    JDK_DOC_LOCATION := $(JDK_TOPDIR)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   557
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   558
    JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   559
    JDK_DOC_FILES := COPYRIGHT README.html  LICENSE THIRDPARTYLICENSEREADME.txt
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   560
    ifeq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   561
        JRE_DOC_FILES += README.txt
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   562
    else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   563
        JRE_DOC_FILES += README
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   564
    endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   565
    JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   566
    JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   567
    JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   568
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   569
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/,$(JRE_DOC_FILES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   570
JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/,$(JRE_DOC_FILES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   571
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/,$(JDK_DOC_FILES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   572
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   573
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   574
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   575
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   576
$(JDK_IMAGE_DIR)/jre/%: $(JRE_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   577
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   578
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   579
$(JRE_IMAGE_DIR)/README.txt: $(JRE_DOC_LOCATION)/README
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   580
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   581
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   582
$(JDK_IMAGE_DIR)/jre/README.txt: $(JRE_DOC_LOCATION)/README
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   583
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   584
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   585
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   586
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   587
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   588
$(JDK_IMAGE_DIR)/demo/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   589
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   590
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   591
$(JDK_IMAGE_DIR)/sample/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   592
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   593
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   594
JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   595
JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   596
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   597
JRE_OVERLAY_INFO_FILE := $(JRE_OVERLAY_IMAGE_DIR)/release
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   598
JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   599
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   600
# Common way to emit a line into the release or info file
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   601
define info-file-item # name value
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   602
$(PRINTF) '%s="%s"\n' $1 $2 >> $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   603
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   604
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   605
define create-info-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   606
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   607
	$(RM) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   608
	$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   609
	$(call info-file-item, "OS_NAME",      "$(REQUIRED_OS_NAME)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   610
	$(call info-file-item, "OS_VERSION",   "$(REQUIRED_OS_VERSION)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   611
	$(call info-file-item, "OS_ARCH",      "$(OPENJDK_TARGET_CPU_LEGACY)")
16041
b9d38accf302 8005545: Add System property to identify ARCH specific details such as ARM hard-float binaries
vladidan
parents: 15693
diff changeset
   612
	if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   613
	$(call info-file-item, "SOURCE",       "$(ALL_SOURCE_TIPS)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   614
endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   615
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   616
ALL_SOURCE_TIPS = $(shell \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   617
  if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   618
    $(CAT) $(OUTPUT_ROOT)/source_tips ; \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   619
  fi)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   620
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   621
$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   622
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   623
	$(call create-info-file)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   624
ifneq ($(PROFILE),)
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   625
	$(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))")
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   626
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   627
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   628
$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   629
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   630
	$(call create-info-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   631
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   632
$(JRE_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   633
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   634
	$(call create-info-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   635
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   636
$(JDK_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   637
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   638
	$(call create-info-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   639
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   640
$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   641
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   642
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   643
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   644
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   645
# Post processing (strip etc)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   646
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   647
ifneq ($(POST_STRIP_CMD),)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   648
    ifeq ($(OPENJDK_TARGET_OS), windows)
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
   649
        EXEC_LIST_BIN:=$(filter-out %$(notdir $(MSVCR_DLL)),$(filter %.exe %.dll,$(ALL_BIN_LIST)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   650
    else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   651
        # Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   652
        EXEC_LIST_BIN:=$(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX)` \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   653
		| $(EGREP) 'ELF' | $(CUT) -d':' -f1)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   654
        # On mac, the old build searches for static libraries for stripping instead of shared.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   655
        # Not clear if it's intentional.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   656
	ifneq ($(OPENJDK_TARGET_OS), macosx)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   657
            EXEC_LIST_LIB:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   658
	endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   659
    endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   660
    # Filter out sjavac
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   661
    EXEC_LIST_BIN:=$(filter-out %sjavac$(EXE_SUFFIX),$(EXEC_LIST_BIN))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   662
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   663
    # Filter out the overlay specific bin files
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   664
    EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   665
    EXEC_LIST_OVERLAY:=$(filter $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   666
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   667
    # Filter out non JRE files and convert to unique touch files to depend on
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   668
    JRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped,\
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   669
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   670
				 $(EXEC_LIST)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   671
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   672
    JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   673
                        $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   674
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   675
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   676
    JDK_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   677
                          $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   678
                          $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   679
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   680
    # Do the same for overlay image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   681
    JRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   682
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   683
				 $(EXEC_LIST_OVERLAY)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   684
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   685
    JDKJRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   686
                        $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   687
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   688
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   689
    JDK_OVERLAY_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   690
                          $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   691
                          $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   692
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   693
    define mcs-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   694
	$(if $(POST_MCS_CMD),$(POST_MCS_CMD) $<)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   695
    endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   696
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   697
    define strip-file
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   698
	$(ECHO) Stripping $(LOG_INFO) $(patsubst $(OUTPUT_ROOT)/%,%,$<)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   699
	$(CHMOD) u+w $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   700
	$(POST_STRIP_CMD) $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   701
	$(call mcs-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   702
	$(CHMOD) go-w $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   703
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   704
	$(TOUCH) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   705
    endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   706
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   707
    # Setup a rule for stripping files based on touch files
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   708
    $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   709
	$(call strip-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   710
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   711
    $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   712
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   713
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   714
    $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   715
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   716
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   717
    $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   718
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   719
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   720
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   721
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   722
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   723
# Main targets
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   724
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   725
jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   726
	$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   727
	$(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   728
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   729
jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   730
	$(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   731
	$(JDK_IMAGE_DIR)/jre/lib/applet \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   732
	$(JDK_DEMO_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   733
	$(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   734
	$(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   735
	$(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   736
	$(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   737
	$(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   738
        $(JDK_IMAGE_DIR)/src.zip
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   739
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   740
jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   741
	 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   742
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   743
jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   744
	$(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   745
	$(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   746
	$(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   747
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   748
ifneq ($(PROFILE),)
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   749
PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS))
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   750
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   751
PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   752
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   753
$(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS)
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   754
	$(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   755
	    $(call profile_name, $(call profile_number, $(PROFILE)))
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   756
	$(TOUCH) $@
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   757
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   758
profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   759
	$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   760
	$(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   761
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   762
.PHONY: profile-image
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   763
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   764
endif # Profile
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   765
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   766
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   767
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   768
.PHONY: default images jre-image jdk-image