Images.gmk 29.1 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.  Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#

include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
include Setup.gmk

31
default: images
32

33 34 35 36 37 38 39 40 41
# Prepare the find cache. Only used if running on windows.
$(eval $(call FillCacheFind,\
    $(wildcard $(JDK_OUTPUTDIR)/bin \
               $(JDK_OUTPUTDIR)/lib \
               $(IMAGES_OUTPUTDIR)/lib \
               $(JDK_OUTPUTDIR)/include \
               $(JDK_OUTPUTDIR)/sample \
               $(JDK_OUTPUTDIR)/demo)))

42 43
include Tools.gmk

44 45
include Profiles.gmk

46 47 48 49 50 51 52 53 54
# Note: This double-colon rule is intentional, to support
# custom make file integration.
images:: jre-image jdk-image

overlay-images: jre-overlay-image jdk-overlay-image


-include $(CUSTOM_MAKE_DIR)/Images.gmk

55

56 57 58
# Processing license files from source area to image area
# These will be modified to have the platform specific EOL chars.
define process-doc-file
O
ohair 已提交
59
	$(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
60 61
	$(MKDIR) -p $(@D)
	$(RM) $@
62
	LC_ALL=C $(SED) 's/$$//g' $< > $@
63 64 65
	$(CHMOD) 444 $@
endef

O
ohair 已提交
66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
define AddFileToCopy
  # Param 1 - src root dir
  # Param 2 - dest root dir
  # Param 3 - src file
  # Param 4 - variable to add targets to

  # Remove src dir root from src file
  $2_$3_FILE := $$(patsubst $1/%,%,$3)

  $2/$$($2_$3_FILE): $3
	$(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
	$$(install-file)

  $4 += $2/$$($2_$3_FILE)
endef
81

82 83 84 85 86
################################################################################
#
# JRE and JDK build rules
#
################################################################################
87 88
#
# Variable prefixes explained:
89
# JRE_ refers to files in the j2re-*-image.
90 91 92
# JDK_ refers to files in the j2sdk-image outside of the jre subdir.
# JDKJRE_ refers to files in the j2sdk-image inside the jre subdir.
#
93 94 95 96

################################################################################
# /bin dir

97 98
ifeq ($(PROFILE),)
    NOT_JRE_BIN_FILES := \
99 100 101 102 103 104 105 106 107 108
	appletviewer$(EXE_SUFFIX) \
	extcheck$(EXE_SUFFIX) \
	idlj$(EXE_SUFFIX) \
	jar$(EXE_SUFFIX) \
	jarsigner$(EXE_SUFFIX) \
	java-rmi.cgi \
	javac$(EXE_SUFFIX) \
	javadoc$(EXE_SUFFIX) \
	javah$(EXE_SUFFIX) \
	javap$(EXE_SUFFIX) \
109
	jdeps$(EXE_SUFFIX) \
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130
	jcmd$(EXE_SUFFIX) \
	jdb$(EXE_SUFFIX) \
	jps$(EXE_SUFFIX) \
	jrunscript$(EXE_SUFFIX) \
	jstat$(EXE_SUFFIX) \
	jstatd$(EXE_SUFFIX) \
	jstack$(EXE_SUFFIX) \
	packagebean$(SCRIPT_SUFFIX) \
	rmic$(EXE_SUFFIX) \
	serialver$(EXE_SUFFIX) \
	unregbean$(EXE_SUFFIX) \
	jconsole$(EXE_SUFFIX) \
	jinfo$(EXE_SUFFIX) \
	jmap$(EXE_SUFFIX) \
	native2ascii$(EXE_SUFFIX) \
	xjc$(EXE_SUFFIX) \
	wsgen$(EXE_SUFFIX) \
	wsimport$(EXE_SUFFIX) \
        schemagen$(EXE_SUFFIX) \
	jsadebugd$(EXE_SUFFIX) \
	jhat$(EXE_SUFFIX)
131
endif
132 133 134

WINDOWS_JDK_BIN_FILES = \
	$(EXE_SUFFIX) \
135
	$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
O
ohair 已提交
136
	$(notdir $(MSVCR_DLL))
137 138 139 140

WINDOWS_JDKJRE_BIN_FILES := \
	$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
	$(SALIB_NAME)
141 142

# Find all files in bin dir
143
ALL_BIN_LIST := $(call CacheFind,$(JDK_OUTPUTDIR)/bin)
144

O
ohair 已提交
145 146 147
# Prevent sjavac from entering the images.
ALL_BIN_LIST := $(filter-out %/sjavac,$(ALL_BIN_LIST))

148
# For unknown reason the debuginfo files for executables are not put into images
149
# e.g filter them out
150 151 152 153 154
ifneq ($(OPENJDK_TARGET_OS),windows)
    ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
else
# On windows, the libraries are in the bin dir, only filter out debuginfo files
# for executables. "java" is both a library and executable.
155
    ALL_BIN_EXEC_FILES := $(filter-out java.exe,$(notdir $(filter %.exe,$(ALL_BIN_LIST))))
156 157 158 159
    ALL_BIN_DEBUG_FILTER := $(addprefix %,$(patsubst %.exe,%.debuginfo,$(ALL_BIN_EXEC_FILES)) \
					   $(patsubst %.exe,%.diz,$(ALL_BIN_EXEC_FILES))) %.pdb
    ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER),$(ALL_BIN_LIST))
endif
160

O
ohair 已提交
161 162 163
JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))

164
ifeq ($(OPENJDK_TARGET_OS),windows)
165
    JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
O
ohair 已提交
166 167 168 169 170 171 172
    # On windows x86, the server jvm is filtered out from the j2re image. This could possibly 
    # be handled by profiles in the future. If no client jvm is built, leave server in.
    ifeq ($(OPENJDK_TARGET_CPU),x86)
        ifeq ($(JVM_VARIANT_CLIENT),true)
            JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%,$(JRE_BIN_LIST))
	endif
    endif
173 174 175
else
    JDK_BIN_LIST := $(ALL_BIN_LIST)
endif
176 177 178 179 180

ifneq ($(OPENJDK_TARGET_CPU_ISADIR),)
    OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
endif

O
ohair 已提交
181 182 183 184 185 186
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
187

O
ohair 已提交
188 189 190 191 192 193
$(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
194 195 196

################################################################################
# /lib dir
197 198 199
ifneq ($(OPENJDK_TARGET_OS), macosx)
    JDKJRE_LIB_FILES := \
	$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
200
	$(SALIB_NAME)
201
endif
202

203 204
ifeq ($(PROFILE),)
    NOT_JRE_LIB_FILES := \
205 206 207 208 209 210 211 212
	tools.jar \
	jconsole.jar \
	sa-jdi.jar \
	dt.jar \
	orb.idl \
	ir.idl \
	ct.sym

213 214 215
    ifeq ($(OPENJDK_TARGET_OS), windows)
      NOT_JRE_LIB_FILES += jawt.lib jvm.lib
    endif
216 217
endif

218
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
219
ifeq ($(OPENJDK_TARGET_OS), linux)
220 221 222
    JDK_LIB_FILES += jexec
endif

O
ohair 已提交
223
# Find all files to copy from $(JDK_OUTPUTDIR)/lib
224
# Jar files are not expected to be here
225 226
ALL_JDKOUT_LIB_LIST := $(call not-containing,_the.,$(filter-out %.jar,\
                            $(call CacheFind,$(JDK_OUTPUTDIR)/lib)))
O
ohair 已提交
227
# Find all files to copy from $(IMAGES_OUTPUTDIR)/lib
228
# This is were the jar files are and might not exist if building overlay-images
O
ohair 已提交
229
ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib),)
230 231
    ALL_IMAGES_LIB_LIST := $(call not-containing,_the.,\
                            $(call CacheFind,$(IMAGES_OUTPUTDIR)/lib))
O
ohair 已提交
232
endif
233

O
ohair 已提交
234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265
# Filter files to copy for each destination
JRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
                       $(ALL_JDKOUT_LIB_LIST))
JDKJRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST))
JDK_JDKOUT_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST))

JRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
                       $(ALL_IMAGES_LIB_LIST))
JDKJRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_IMAGES_LIB_LIST))
JDK_IMAGES_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_IMAGES_LIB_LIST))

# Iterate over files to copy to create rules for each one
$(foreach f,$(JRE_JDKOUT_LIB_LIST),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
$(foreach f,$(JDK_JDKOUT_LIB_LIST),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
$(foreach f,$(JDKJRE_JDKOUT_LIB_LIST),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))

$(foreach f,$(JRE_IMAGES_LIB_LIST),\
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
$(foreach f,$(JDK_IMAGES_LIB_LIST),\
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
$(foreach f,$(JDKJRE_IMAGES_LIB_LIST),\
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))

$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS)))
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS)))
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)),\
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS)))
266

267 268 269 270 271 272 273
ifneq ($(PROFILE),)
# Files in lib$(PROFILE) are excluded from the generic copying routines so 
# we have to add them back in here
$(foreach f,$(CUSTOM_PROFILE_JARS),\
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS)))
endif

274 275
# CTE plugin security change require new empty directory lib/applet
$(JRE_IMAGE_DIR)/lib/applet: 
O
ohair 已提交
276
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
277 278 279
	$(MKDIR) -p $@

$(JDK_IMAGE_DIR)/jre/lib/applet: 
O
ohair 已提交
280
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
281 282
	$(MKDIR) -p $@

283
# In the old build, JObjC.jar is not part of the meta-index
284
$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
O
ohair 已提交
285
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
286
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
287 288

$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
O
ohair 已提交
289
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
290
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
291 292

$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
O
ohair 已提交
293
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
294 295
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar

296
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
O
ohair 已提交
297
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
298 299 300 301
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar

################################################################################
# /man dir
O
ohair 已提交
302 303 304
# Avoid evaluating this whole section on windows for speed and stability
ifneq ($(OPENJDK_TARGET_OS),windows)
    JRE_MAN_PAGES := \
305 306 307 308 309 310 311 312 313 314 315
	java.1		\
	keytool.1	\
	orbd.1          \
	pack200.1	\
	policytool.1    \
	rmid.1		\
	rmiregistry.1	\
	servertool.1    \
	tnameserv.1     \
	unpack200.1

O
ohair 已提交
316 317 318
    ifndef OPENJDK
        JRE_MAN_PAGES += javaws.1
    endif
319

O
ohair 已提交
320
    JDK_MAN_PAGES =        \
321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350
	$(JRE_MAN_PAGES)   \
	appletviewer.1     \
	extcheck.1         \
	idlj.1             \
	jar.1              \
	jarsigner.1        \
	javac.1            \
	javadoc.1          \
	javah.1            \
	javap.1            \
	jconsole.1         \
	jcmd.1             \
	jdb.1              \
	jhat.1             \
        jinfo.1            \
        jmap.1             \
        jps.1              \
	jrunscript.1       \
        jsadebugd.1        \
        jstack.1           \
        jstat.1            \
        jstatd.1           \
	native2ascii.1     \
	rmic.1             \
        schemagen.1        \
	serialver.1        \
        wsgen.1            \
        wsimport.1         \
        xjc.1

O
ohair 已提交
351 352 353
    ifndef OPENJDK
        JDK_MAN_PAGES += jvisualvm.1
    endif
354

355 356 357 358 359 360
    ifndef OPENJDK
        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src/closed
    else
        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src
    endif

O
ohair 已提交
361
    ifeq ($(OPENJDK_TARGET_OS), linux)
362
        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc
O
ohair 已提交
363 364 365
        MAN1_SUBDIR:=man
    endif
    ifeq ($(OPENJDK_TARGET_OS), solaris)
366
        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/solaris/doc
O
ohair 已提交
367 368 369
        MAN1_SUBDIR:=sun/man/man1
    endif
    ifeq ($(OPENJDK_TARGET_OS), macosx)
370
        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/bsd/doc
O
ohair 已提交
371 372 373 374
        MAN1_SUBDIR:=man
        JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
        JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
    endif
375

376

O
ohair 已提交
377 378
    $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
379 380
	$(install-file)

O
ohair 已提交
381 382
    $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
383 384
	$(install-file)

O
ohair 已提交
385 386
    $(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
387 388
	$(install-file)

O
ohair 已提交
389 390
    $(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
391 392
	$(install-file)

O
ohair 已提交
393
    define install-ja-manpage
394 395 396 397 398 399
	$(MKDIR) -p $(@D)
	$(CAT) $< \
		| $(NATIVE2ASCII) -encoding eucJP \
		| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
		| $(NATIVE2ASCII) -reverse -encoding $1 \
		> $@
O
ohair 已提交
400
    endef
401

O
ohair 已提交
402 403
    $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
404 405
	$(call install-ja-manpage,UTF-8)

O
ohair 已提交
406 407
    $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
408 409
	$(call install-ja-manpage,UTF-8)

O
ohair 已提交
410 411
    $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
412 413
	$(call install-ja-manpage,PCK)

O
ohair 已提交
414 415
    $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
416 417
	$(call install-ja-manpage,PCK)

O
ohair 已提交
418 419 420 421
    ifeq ($(OPENJDK_TARGET_OS), solaris)
        $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
		$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
		$(install-file)
422

O
ohair 已提交
423 424 425 426
        $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
		$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
		$(install-file)
    endif
427

O
ohair 已提交
428 429 430
    # Old build creates empty man page for this, mimicing behaviour.
    $(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:
	$(ECHO) $(LOG_INFO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@)
431 432 433
	$(MKDIR) -p $(@D)
	$(TOUCH) $@

O
ohair 已提交
434 435 436 437
    ifeq ($(OPENJDK_TARGET_OS), linux)
        $(JRE_IMAGE_DIR)/man/ja:
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
438

O
ohair 已提交
439 440 441 442
        $(JDK_IMAGE_DIR)/man/ja:
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
    endif
443

O
ohair 已提交
444 445 446 447
    ifeq ($(OPENJDK_TARGET_OS), macosx)
        $(JRE_IMAGE_DIR)/man/ja:
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
448

O
ohair 已提交
449 450 451 452
        $(JDK_IMAGE_DIR)/man/ja:
		$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
		$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
    endif
453

O
ohair 已提交
454 455 456 457
    ifeq ($(OPENJDK_TARGET_OS), linux)
        JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
                             $(JRE_IMAGE_DIR)/man/ja
458

O
ohair 已提交
459 460 461 462
        JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
                             $(JDK_IMAGE_DIR)/man/ja
    endif
463

O
ohair 已提交
464 465 466 467 468
    ifeq ($(OPENJDK_TARGET_OS), solaris)
        JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/,$(JRE_MAN_PAGES)) \
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JRE_MAN_PAGES))
469

O
ohair 已提交
470 471 472 473 474
        JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES))
    endif
475

O
ohair 已提交
476 477 478 479
    ifeq ($(OPENJDK_TARGET_OS), macosx)
        JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \
                             $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \
                             $(JRE_IMAGE_DIR)/man/ja
480

O
ohair 已提交
481 482 483 484 485 486
        JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \
                             $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \
                             $(JDK_IMAGE_DIR)/man/ja
    endif

endif # Windows
487

488 489 490
################################################################################
# /demo dir

491
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
492 493 494 495

#   The db demo contains an empty dir that needs to be copied. The other 
#   directories will always trigger the rule for recompile since 
#   _the.list_of_packages files are touched.
O
ohair 已提交
496
$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
497
	if [ ! -d "$@" ]; then \
O
ohair 已提交
498
	  $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
499 500 501 502 503
	  $(MKDIR) -p $(@D); \
	  if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
	fi

#   Find all files including directories
O
ohair 已提交
504
JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\
505 506 507 508
			$(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))



O
ohair 已提交
509 510 511
# Param 1 is source file
define CreateOverlayDemoRule
    $1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\
512
			$$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
O
ohair 已提交
513 514 515
    $$($1_TARGET): $1
		$(ECHO) $(LOG_INFO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
		$$(call install-file)
516

O
ohair 已提交
517 518
    JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
endef
519
JDK_OVERLAY_DEMO_SOURCES := $(filter %$(SHARED_LIBRARY_SUFFIX),$(call CacheFind,$(JDK_OUTPUTDIR)/demo))
O
ohair 已提交
520
$(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib))))
521 522 523 524

################################################################################
# /sample dir

525
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/sample),\
O
ohair 已提交
526
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS)))
527 528 529 530 531 532 533 534

################################################################################
# /db dir

ifndef OPENJDK
    $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/%
	$(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<)
	$(MKDIR) -p $(JDK_IMAGE_DIR)/db
535 536
	cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x */index.html */KEYS */test/* *javadoc/* */docs/* */demo/* 2> /dev/null
	cd $(JDK_IMAGE_DIR)/db && $(MV) db-derby-*-bin/* . && $(RM) -r db-derby-*-bin
537 538 539 540
	$(MKDIR) -p $(@D)
	$(TOUCH) $@

    $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html
O
ohair 已提交
541
	$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
542 543 544 545 546
	$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@

    $(JDK_IMAGE_DIR)/db/3RDPARTY: $(JDK_TOPDIR)/src/closed/share/db/3RDPARTY
	$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
	$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@
547 548

    JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\
549 550
			$(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)) \
		      $(JDK_IMAGE_DIR)/db/README-JDK.html $(JDK_IMAGE_DIR)/db/3RDPARTY
551

552
endif
553

554 555
################################################################################
# /include dir
556

557
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/include),\
O
ohair 已提交
558
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_INCLUDE_TARGETS)))
559

560 561
################################################################################
# doc files
562

563 564 565 566 567 568 569 570
ifdef OPENJDK
    JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
    JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
    JRE_DOC_LOCATION := $(JDK_TOPDIR)
    JDK_DOC_LOCATION := $(JDK_TOPDIR)
else
    JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
    JDK_DOC_FILES := COPYRIGHT README.html  LICENSE THIRDPARTYLICENSEREADME.txt
571
    ifeq ($(OPENJDK_TARGET_OS), windows)
572 573 574 575
        JRE_DOC_FILES += README.txt
    else
        JRE_DOC_FILES += README
    endif
O
ohair 已提交
576
    JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
577 578 579 580 581 582
    JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre
    JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk
endif
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/,$(JRE_DOC_FILES))
JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/,$(JRE_DOC_FILES))
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/,$(JDK_DOC_FILES))
583

584
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
585
	$(process-doc-file)
586 587

$(JDK_IMAGE_DIR)/jre/%: $(JRE_DOC_LOCATION)/%
588
	$(process-doc-file)
589 590

$(JRE_IMAGE_DIR)/README.txt: $(JRE_DOC_LOCATION)/README
591
	$(process-doc-file)
592 593

$(JDK_IMAGE_DIR)/jre/README.txt: $(JRE_DOC_LOCATION)/README
594
	$(process-doc-file)
595 596

$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
597
	$(process-doc-file)
598 599

$(JDK_IMAGE_DIR)/demo/%: $(JDK_DOC_LOCATION)/%
600
	$(process-doc-file)
601 602

$(JDK_IMAGE_DIR)/sample/%: $(JDK_DOC_LOCATION)/%
603
	$(process-doc-file)
604 605 606 607

JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release
JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release

608 609 610
JRE_OVERLAY_INFO_FILE := $(JRE_OVERLAY_IMAGE_DIR)/release
JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release

611 612 613 614 615
# Common way to emit a line into the release or info file
define info-file-item # name value
$(PRINTF) '%s="%s"\n' $1 $2 >> $@
endef

616 617 618 619 620 621 622
define create-info-file
	$(MKDIR) -p $(@D)
	$(RM) $@
	$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
	$(call info-file-item, "OS_NAME",      "$(REQUIRED_OS_NAME)")
	$(call info-file-item, "OS_VERSION",   "$(REQUIRED_OS_VERSION)")
	$(call info-file-item, "OS_ARCH",      "$(OPENJDK_TARGET_CPU_LEGACY)")
623
	if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi
624 625 626
	$(call info-file-item, "SOURCE",       "$(ALL_SOURCE_TIPS)")
endef

627 628 629 630 631 632
ALL_SOURCE_TIPS = $(shell \
  if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
    $(CAT) $(OUTPUT_ROOT)/source_tips ; \
  fi)

$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
O
ohair 已提交
633
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
634
	$(call create-info-file)
635 636 637
ifneq ($(PROFILE),)
	$(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))")
endif
638 639

$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
O
ohair 已提交
640
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
641 642 643
	$(call create-info-file)

$(JRE_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
O
ohair 已提交
644
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
645 646 647
	$(call create-info-file)

$(JDK_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
O
ohair 已提交
648
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
649
	$(call create-info-file)
650 651

$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
O
ohair 已提交
652
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
653 654 655 656 657 658
	$(install-file)

################################################################################
# Post processing (strip etc)

ifneq ($(POST_STRIP_CMD),)
659
    ifeq ($(OPENJDK_TARGET_OS), windows)
660
        EXEC_LIST_BIN:=$(filter-out %$(notdir $(MSVCR_DLL)),$(filter %.exe %.dll,$(ALL_BIN_LIST)))
661 662
    else
        # Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed
663
        EXEC_LIST_BIN:=$(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX) ! -name \*.debuginfo` \
664
		| $(EGREP) 'ELF' | $(CUT) -d':' -f1)
665 666 667 668 669
        # On mac, the old build searches for static libraries for stripping instead of shared.
        # Not clear if it's intentional.
	ifneq ($(OPENJDK_TARGET_OS), macosx)
            EXEC_LIST_LIB:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX))
	endif
670
    endif
O
ohair 已提交
671 672
    # Filter out sjavac
    EXEC_LIST_BIN:=$(filter-out %sjavac$(EXE_SUFFIX),$(EXEC_LIST_BIN))
673 674 675 676 677

    # Filter out the overlay specific bin files
    EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
    EXEC_LIST_OVERLAY:=$(filter $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)

678
    # Filter out non JRE files and convert to unique touch files to depend on
679
    JRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped,\
680 681
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
				 $(EXEC_LIST)))
682

683
    JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
684 685 686
                        $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))

687
    JDK_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
688 689 690
                          $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
                          $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))

691 692 693 694 695 696 697 698
    # Do the same for overlay image
    JRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped,\
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
				 $(EXEC_LIST_OVERLAY)))

    JDKJRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
                        $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
			$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY)))
699

700 701 702 703 704 705 706 707 708
    JDK_OVERLAY_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
                          $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
                          $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))

    define mcs-file
	$(if $(POST_MCS_CMD),$(POST_MCS_CMD) $<)
    endef

    define strip-file
O
ohair 已提交
709
	$(ECHO) Stripping $(LOG_INFO) $(patsubst $(OUTPUT_ROOT)/%,%,$<)
710 711
	$(CHMOD) u+w $<
	$(POST_STRIP_CMD) $<
712
	$(call mcs-file)
713 714 715
	$(CHMOD) go-w $<
	$(MKDIR) -p $(@D)
	$(TOUCH) $@
716
    endef
717

718
    # Setup a rule for stripping files based on touch files
719
    $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/%
720 721 722 723 724 725 726 727 728 729
	$(call strip-file)

    $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/%
	$(call strip-file)

    $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/%
	$(call strip-file)

    $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/%
	$(call strip-file)
730

731 732 733 734 735 736 737
endif

################################################################################
# Main targets

jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
	$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
738
	$(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST)
739 740 741 742 743 744 745 746 747

jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
	$(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
	$(JDK_IMAGE_DIR)/jre/lib/applet \
	$(JDK_DEMO_TARGETS) \
	$(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \
	$(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
	$(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
	$(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
748
	$(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
749
        $(JDK_IMAGE_DIR)/src.zip
750

751 752 753 754 755 756 757 758
jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
	 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)

jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
	$(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \
	$(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \
	$(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 

759
ifneq ($(PROFILE),)
760 761 762 763 764 765 766 767 768
PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS))

PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked

$(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS)
	$(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \
	    $(call profile_name, $(call profile_number, $(PROFILE)))
	$(TOUCH) $@

769 770
profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \
	$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
771
	$(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED)
772 773 774 775 776

.PHONY: profile-image

endif # Profile

777
################################################################################
778

779
.PHONY: default images jre-image jdk-image