jdk/makefiles/Images.gmk
author twisti
Mon, 24 Sep 2012 11:07:03 -0700
changeset 13888 93dce24e57e5
parent 13702 efd6a05935b2
child 14231 a0c23c1c010f
permissions -rw-r--r--
7188176: The JVM should differentiate between T and M series and adjust GC ergonomics Reviewed-by: kvn Contributed-by: Tao Mao <tao.mao@oracle.com>
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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
include Tools.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    35
# Note: This double-colon rule is intentional, to support
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    36
# custom make file integration.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    37
images:: jre-image jdk-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    38
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    39
overlay-images: jre-overlay-image jdk-overlay-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    40
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    41
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    42
-include $(CUSTOM_MAKE_DIR)/Images.gmk
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    43
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    45
ifeq ($(OPENJDK_TARGET_OS),solaris)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    46
# On Solaris, if the target is a symlink and exists, cp won't overwrite.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    47
define install-file
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    48
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    49
	$(RM) '$@'
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    50
	$(CP) -f -r -P '$<' '$(@D)'
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    51
endef
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    52
else ifeq ($(OPENJDK_TARGET_OS),macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    53
define install-file
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    54
	$(MKDIR) -p $(@D)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    55
	$(CP) -fpRP '$<' '$@'
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    56
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    57
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    58
define install-file
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    59
	$(MKDIR) -p $(@D)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    60
	$(CP) -fP '$<' '$@'
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    61
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    62
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    63
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    64
# Processing license files from source area to image area
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    65
# These will be modified to have the platform specific EOL chars.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    66
define process-doc-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    67
	$(ECHO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    68
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    69
	$(RM) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    70
	$(SED) 's/$$//g' $< > $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    71
	$(CHMOD) 444 $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    72
endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    73
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    74
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    75
JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    76
JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    77
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    78
JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-overlay-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    79
JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-overlay-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    80
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    81
################################################################################
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
# JRE and JDK build rules
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    84
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    85
################################################################################
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    86
#
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    87
# Variable prefixes explained:
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    88
# JRE_ refers to files in the j2re-image.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    89
# 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
    90
# JDKJRE_ refers to files in the j2sdk-image inside the jre subdir.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    91
#
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    92
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
# /bin dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    95
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    96
$(JRE_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    97
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    98
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    99
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   100
$(JDK_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   101
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   102
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   103
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   104
$(JDK_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   105
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   106
	$(install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   108
# Overaly image targets
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   109
$(JRE_OVERLAY_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   110
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   111
	$(install-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   112
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   113
$(JDK_OVERLAY_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   114
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   115
	$(install-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   116
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   117
$(JDK_OVERLAY_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   118
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   119
	$(install-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   120
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   121
NOT_JRE_BIN_FILES := \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   122
	appletviewer$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   123
	extcheck$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   124
	idlj$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   125
	jar$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   126
	jarsigner$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   127
	java-rmi.cgi \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   128
	javac$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   129
	javadoc$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   130
	javah$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   131
	javap$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   132
	jcmd$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   133
	jdb$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   134
	jps$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   135
	jrunscript$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   136
	jstat$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   137
	jstatd$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   138
	jstack$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   139
	packagebean$(SCRIPT_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   140
	rmic$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   141
	serialver$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   142
	unregbean$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   143
	jconsole$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   144
	jinfo$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   145
	jmap$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   146
	native2ascii$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   147
	xjc$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   148
	wsgen$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   149
	wsimport$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   150
        schemagen$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   151
	jsadebugd$(EXE_SUFFIX) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   152
	jhat$(EXE_SUFFIX)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   153
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   154
WINDOWS_JDK_BIN_FILES = \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   155
	$(EXE_SUFFIX) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   156
	$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   157
	$(notdir $(MSVCRNN_DLL))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   158
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   159
WINDOWS_JDKJRE_BIN_FILES := \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   160
	$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   161
	$(SALIB_NAME)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   162
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   163
# Find all files in bin dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   164
ALL_BIN_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   165
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   166
# 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
   167
# e.g filter them out
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   168
ifneq ($(OPENJDK_TARGET_OS),windows)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   169
    ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   170
else
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   171
# 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
   172
# for executables. "java" is both a library and executable.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   173
    ALL_BIN_EXEC_FILES := $(filter-out java.exe,$(notdir $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name "*.exe")))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   174
    ALL_BIN_DEBUG_FILTER := $(addprefix %,$(patsubst %.exe,%.debuginfo,$(ALL_BIN_EXEC_FILES)) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   175
					   $(patsubst %.exe,%.diz,$(ALL_BIN_EXEC_FILES))) %.pdb
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   176
    ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER),$(ALL_BIN_LIST))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   177
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   178
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   179
ifeq ($(OPENJDK_TARGET_OS),windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   180
    JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   181
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   182
    JDK_BIN_LIST := $(ALL_BIN_LIST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   183
endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   184
JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   185
JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   186
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   187
ifneq ($(OPENJDK_TARGET_CPU_ISADIR),)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   188
    OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   189
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   190
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   191
JRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   192
			$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   193
JDK_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   194
			$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   195
JDKJRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   196
			$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   197
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   198
JRE_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_OVERLAY_IMAGE_DIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   199
				$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   200
JDK_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_OVERLAY_IMAGE_DIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   201
				$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   202
JDKJRE_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_OVERLAY_IMAGE_DIR)/jre/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   203
				$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   204
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   205
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   206
# /lib dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   207
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   208
$(JRE_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   209
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   210
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   211
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   212
$(JDK_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   213
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   214
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   215
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   216
$(JDK_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   217
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   218
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   219
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   220
# Overlay image targets
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   221
$(JRE_OVERLAY_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   222
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   223
	$(install-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   224
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   225
$(JDK_OVERLAY_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   226
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   227
	$(install-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   228
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   229
$(JDK_OVERLAY_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   230
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   231
	$(install-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   232
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   233
ifneq ($(OPENJDK_TARGET_OS), macosx)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   234
    JDKJRE_LIB_FILES := \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   235
	$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   236
	$(SALIB_NAME)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   237
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   238
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   239
NOT_JRE_LIB_FILES := \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   240
	tools.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   241
	jconsole.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   242
	sa-jdi.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   243
	dt.jar \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   244
	orb.idl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   245
	ir.idl \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   246
	ct.sym
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   247
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   248
ifeq ($(OPENJDK_TARGET_OS), windows)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   249
    NOT_JRE_LIB_FILES += jawt.lib jvm.lib
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   250
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   251
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   252
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   253
ifeq ($(OPENJDK_TARGET_OS), linux)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   254
    JDK_LIB_FILES += jexec
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   255
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   256
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   257
ALL_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \( -name "_the*" -o -name "javac_state " \) )
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   258
JRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),$(ALL_LIB_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   259
JDKJRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_LIB_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   260
JDK_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_LIB_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   261
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   262
JRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%,$(JRE_LIB_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   263
JDK_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%,$(JDK_LIB_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   264
JDKJRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%,$(JDKJRE_LIB_LIST))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   265
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   266
JRE_OVERLAY_LIB_TARGETS := $(subst $(JRE_IMAGE_DIR),$(JRE_OVERLAY_IMAGE_DIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   267
				$(filter $(JRE_IMAGE_DIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_LIB_TARGETS)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   268
JDK_OVERLAY_LIB_TARGETS := $(subst $(JDK_IMAGE_DIR),$(JDK_OVERLAY_IMAGE_DIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   269
				$(filter $(JDK_IMAGE_DIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_LIB_TARGETS)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   270
JDKJRE_OVERLAY_LIB_TARGETS := $(subst $(JDK_IMAGE_DIR),$(JDK_OVERLAY_IMAGE_DIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   271
				$(filter $(JDK_IMAGE_DIR)/jre/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_LIB_TARGETS)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   272
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   273
# CTE plugin security change require new empty directory lib/applet
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   274
$(JRE_IMAGE_DIR)/lib/applet: 
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   275
	$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   276
	$(MKDIR) -p $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   277
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   278
$(JDK_IMAGE_DIR)/jre/lib/applet: 
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   279
	$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   280
	$(MKDIR) -p $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   281
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   282
# 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
   283
$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   284
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   285
	$(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
   286
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   287
$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   288
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   289
	$(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
   290
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   291
$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   292
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   293
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   294
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   295
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   296
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   297
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   298
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
# /man dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   301
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   302
JRE_MAN_PAGES := \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   303
	java.1		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   304
	keytool.1	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   305
	orbd.1          \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   306
	pack200.1	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   307
	policytool.1    \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   308
	rmid.1		\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   309
	rmiregistry.1	\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   310
	servertool.1    \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   311
	tnameserv.1     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   312
	unpack200.1
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   313
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   314
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   315
  JRE_MAN_PAGES += javaws.1
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   316
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   317
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   318
JDK_MAN_PAGES =            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   319
	$(JRE_MAN_PAGES)   \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   320
	appletviewer.1     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   321
	extcheck.1         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   322
	idlj.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   323
	jar.1              \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   324
	jarsigner.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   325
	javac.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   326
	javadoc.1          \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   327
	javah.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   328
	javap.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   329
	jconsole.1         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   330
	jcmd.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   331
	jdb.1              \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   332
	jhat.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   333
        jinfo.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   334
        jmap.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   335
        jps.1              \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   336
	jrunscript.1       \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   337
        jsadebugd.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   338
        jstack.1           \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   339
        jstat.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   340
        jstatd.1           \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   341
	native2ascii.1     \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   342
	rmic.1             \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   343
        schemagen.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   344
	serialver.1        \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   345
        wsgen.1            \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   346
        wsimport.1         \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   347
        xjc.1
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   348
13497
2c09fb7cdf7f 7192804: Build should not install jvisualvm man page for OpenJDK
andrew
parents: 13164
diff changeset
   349
ifndef OPENJDK
2c09fb7cdf7f 7192804: Build should not install jvisualvm man page for OpenJDK
andrew
parents: 13164
diff changeset
   350
  JDK_MAN_PAGES += jvisualvm.1
2c09fb7cdf7f 7192804: Build should not install jvisualvm man page for OpenJDK
andrew
parents: 13164
diff changeset
   351
endif
2c09fb7cdf7f 7192804: Build should not install jvisualvm man page for OpenJDK
andrew
parents: 13164
diff changeset
   352
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   353
ifeq ($(OPENJDK_TARGET_OS), linux)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   354
    MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   355
    MAN1_SUBDIR:=man
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   356
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   357
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   358
    MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   359
    MAN1_SUBDIR:=sun/man/man1
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   360
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   361
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   362
    MAN_SRC_DIR:=$(JDK_TOPDIR)/src/bsd/doc
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   363
    MAN1_SUBDIR:=man
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   364
    JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   365
    JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   366
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   367
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   368
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   369
$(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   370
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   371
	$(install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   372
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   373
$(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   374
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   375
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   376
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   377
$(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   378
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   379
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   380
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   381
$(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   382
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   383
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   384
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   385
define install-ja-manpage
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   386
	$(MKDIR) -p $(@D)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   387
	$(CAT) $< \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   388
		| $(NATIVE2ASCII) -encoding eucJP \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   389
		| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   390
		| $(NATIVE2ASCII) -reverse -encoding $1 \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   391
		> $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   392
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   393
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   394
$(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   395
	$(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   396
	$(call install-ja-manpage,UTF-8)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   397
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   398
$(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   399
	$(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   400
	$(call install-ja-manpage,UTF-8)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   401
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   402
$(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   403
	$(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   404
	$(call install-ja-manpage,PCK)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   405
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   406
$(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   407
	$(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   408
	$(call install-ja-manpage,PCK)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   409
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   410
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   411
    $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   412
	$(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   413
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   414
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   415
    $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   416
	$(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   417
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   418
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   419
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   420
# Old build creates empty man page for this, mimicing behaviour.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   421
$(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:
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   422
	$(ECHO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   423
	$(MKDIR) -p $(@D)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   424
	$(TOUCH) $@
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   425
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   426
ifeq ($(OPENJDK_TARGET_OS), linux)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   427
    $(JRE_IMAGE_DIR)/man/ja:
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   428
	$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   429
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   430
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   431
    $(JDK_IMAGE_DIR)/man/ja:
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   432
	$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   433
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   434
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   435
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   436
ifeq ($(OPENJDK_TARGET_OS), macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   437
    $(JRE_IMAGE_DIR)/man/ja:
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   438
	$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   439
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   440
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   441
    $(JDK_IMAGE_DIR)/man/ja:
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   442
	$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   443
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   444
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   445
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   446
ifeq ($(OPENJDK_TARGET_OS), linux)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   447
    JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   448
			 $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   449
			 $(JRE_IMAGE_DIR)/man/ja
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   450
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   451
    JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   452
			 $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   453
			 $(JDK_IMAGE_DIR)/man/ja
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   454
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   455
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   456
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   457
    JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   458
			 $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/,$(JRE_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   459
			 $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   460
			 $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JRE_MAN_PAGES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   461
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   462
    JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   463
			 $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   464
			 $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   465
			 $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   466
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   467
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   468
ifeq ($(OPENJDK_TARGET_OS), macosx)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   469
    JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   470
			 $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   471
			 $(JRE_IMAGE_DIR)/man/ja
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   472
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   473
    JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   474
			 $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   475
			 $(JDK_IMAGE_DIR)/man/ja
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   476
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   477
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   478
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   479
# /demo dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   480
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   481
ifndef NO_DEMOS
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   482
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   483
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   484
#   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
   485
#   directories will always trigger the rule for recompile since 
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   486
#   _the.list_of_packages files are touched.
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   487
    $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   488
	if [ ! -d "$@" ]; then \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   489
	  $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   490
	  $(MKDIR) -p $(@D); \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   491
	  if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   492
	fi
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   493
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   494
#   Find all files including directories
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   495
    JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   496
			$(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   497
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   498
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   499
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   500
    # Param 1 is source file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   501
    define CreateOverlayDemoRule
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   502
        $1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   503
			$$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   504
        $$($1_TARGET): $1
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   505
		$(ECHO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   506
		$(MKDIR) -p $$(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   507
		$(RM) $$@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   508
		$(CP) -f '$$<' '$$@'
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   509
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   510
        JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   511
    endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   512
    JDK_OVERLAY_DEMO_SOURCES := $(shell $(FIND) $(JDK_OUTPUTDIR)/demo -name "*$(SHARED_LIBRARY_SUFFIX)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   513
    $(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib))))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   514
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   515
endif
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
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   518
# /sample dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   519
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   520
ifndef NO_SAMPLES
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   521
    $(JDK_IMAGE_DIR)/sample/%: $(JDK_OUTPUTDIR)/sample/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   522
	$(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   523
	$(install-file)
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
    JDK_SAMPLE_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/sample/%,$(JDK_IMAGE_DIR)/sample/%,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   526
			$(shell $(FIND) $(JDK_OUTPUTDIR)/sample -type f))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   527
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   528
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   529
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   530
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   531
# /db dir
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
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   534
    $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   535
	$(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   536
	$(MKDIR) -p $(JDK_IMAGE_DIR)/db
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   537
	cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $< -x index.html 2> /dev/null
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   538
	$(MKDIR) -p $(@D)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   539
	$(TOUCH) $@
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
    $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   542
	$(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   543
	$(install-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   544
	$(CHMOD) 644 $(@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   545
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   546
    JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   547
			$(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*.zip" ! -name "*demo*")) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   548
		      $(JDK_IMAGE_DIR)/db/README-JDK.html
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
endif
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
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   553
# /include dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   554
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   555
$(JDK_IMAGE_DIR)/include/%: $(JDK_OUTPUTDIR)/include/%
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   556
	$(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   557
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   558
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   559
    JDK_INCLUDE_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/include/%,$(JDK_IMAGE_DIR)/include/%,\
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   560
			$(shell $(FIND) $(JDK_OUTPUTDIR)/include -type f))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   561
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   562
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   563
# doc files
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   564
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   565
ifdef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   566
    JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   567
    JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   568
    JRE_DOC_LOCATION := $(JDK_TOPDIR)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   569
    JDK_DOC_LOCATION := $(JDK_TOPDIR)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   570
else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   571
    JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   572
    JDK_DOC_FILES := COPYRIGHT README.html  LICENSE THIRDPARTYLICENSEREADME.txt
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   573
    ifeq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   574
        JRE_DOC_FILES += README.txt
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   575
    else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   576
        JRE_DOC_FILES += README
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   577
    endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   578
    ifndef NO_DEMOS
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   579
        JDK_DOC_FILES += demo/DEMOS_LICENSE
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   580
    endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   581
    ifndef NO_SAMPLES
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   582
        JDK_DOC_FILES += sample/SAMPLES_LICENSE
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   583
    endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   584
    JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   585
    JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   586
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   587
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/,$(JRE_DOC_FILES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   588
JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/,$(JRE_DOC_FILES))
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   589
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/,$(JDK_DOC_FILES))
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
$(JRE_IMAGE_DIR)/%: $(JRE_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
$(JDK_IMAGE_DIR)/jre/%: $(JRE_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   595
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   596
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   597
$(JRE_IMAGE_DIR)/README.txt: $(JRE_DOC_LOCATION)/README
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   598
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   599
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   600
$(JDK_IMAGE_DIR)/jre/README.txt: $(JRE_DOC_LOCATION)/README
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   601
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   602
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   603
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   604
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   605
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   606
$(JDK_IMAGE_DIR)/demo/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   607
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   608
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   609
$(JDK_IMAGE_DIR)/sample/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   610
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   611
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   612
JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   613
JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   614
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   615
JRE_OVERLAY_INFO_FILE := $(JRE_OVERLAY_IMAGE_DIR)/release
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   616
JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   617
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   618
# Common way to emit a line into the release or info file
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   619
define info-file-item # name value
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   620
$(PRINTF) '%s="%s"\n' $1 $2 >> $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   621
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   622
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   623
define create-info-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   624
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   625
	$(RM) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   626
	$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   627
	$(call info-file-item, "OS_NAME",      "$(REQUIRED_OS_NAME)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   628
	$(call info-file-item, "OS_VERSION",   "$(REQUIRED_OS_VERSION)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   629
	$(call info-file-item, "OS_ARCH",      "$(OPENJDK_TARGET_CPU_LEGACY)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   630
	$(call info-file-item, "SOURCE",       "$(ALL_SOURCE_TIPS)")
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   631
endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   632
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   633
ALL_SOURCE_TIPS = $(shell \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   634
  if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   635
    $(CAT) $(OUTPUT_ROOT)/source_tips ; \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   636
  fi)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   637
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   638
$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   639
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   640
	$(call create-info-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   641
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   642
$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   643
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   644
	$(call create-info-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   645
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   646
$(JRE_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   647
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   648
	$(call create-info-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   649
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   650
$(JDK_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   651
	$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   652
	$(call create-info-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   653
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   654
$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   655
	$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   656
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   657
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   658
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   659
# Post processing (strip etc)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   660
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   661
ifneq ($(POST_STRIP_CMD),)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   662
    ifeq ($(OPENJDK_TARGET_OS), windows)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   663
        EXEC_LIST_BIN:=$(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*.exe \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   664
		-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)")
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   665
    else
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   666
        # 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
   667
        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
   668
		| $(EGREP) 'ELF' | $(CUT) -d':' -f1)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   669
        # 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
   670
        # Not clear if it's intentional.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   671
	ifneq ($(OPENJDK_TARGET_OS), macosx)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   672
            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
   673
	endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   674
    endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   675
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   676
    # Filter out the overlay specific bin files
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   677
    EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   678
    EXEC_LIST_OVERLAY:=$(filter $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   679
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   680
    # Filter out non JRE files and convert to unique touch files to depend on
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   681
    JRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre/%.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)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   684
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   685
    JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   686
                        $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   687
			$(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
   688
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   689
    JDK_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   690
                          $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   691
                          $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   692
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   693
    # Do the same for overlay image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   694
    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
   695
			$(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
   696
				 $(EXEC_LIST_OVERLAY)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   697
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   698
    JDKJRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   699
                        $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   700
			$(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
   701
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   702
    JDK_OVERLAY_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   703
                          $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   704
                          $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   705
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   706
    define mcs-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   707
	$(if $(POST_MCS_CMD),$(POST_MCS_CMD) $<)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   708
    endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   709
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   710
    define strip-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   711
	$(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   712
	$(CHMOD) u+w $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   713
	$(POST_STRIP_CMD) $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   714
	$(call mcs-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   715
	$(CHMOD) go-w $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   716
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   717
	$(TOUCH) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   718
    endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   719
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   720
    # Setup a rule for stripping files based on touch files
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   721
    $(IMAGES_OUTPUTDIR)/_strip_jre/%.stripped: $(JRE_IMAGE_DIR)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   722
	$(call strip-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   723
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   724
    $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   725
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   726
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   727
    $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   728
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   729
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   730
    $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/%
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   731
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   732
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   733
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   734
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   735
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   736
# Main targets
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   737
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   738
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
   739
	$(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
   740
	$(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
   741
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   742
jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   743
	$(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   744
	$(JDK_IMAGE_DIR)/jre/lib/applet \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   745
	$(JDK_DEMO_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   746
	$(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
   747
	$(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   748
	$(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   749
	$(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   750
	$(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   751
        $(JDK_IMAGE_DIR)/src.zip
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   752
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   753
jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   754
	 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   755
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   756
jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   757
	$(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   758
	$(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   759
	$(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   760
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   761
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   762
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   763
.PHONY: default images jre-image jdk-image