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