make/Jprt.gmk
author mchung
Thu, 19 May 2016 11:17:35 -0700
changeset 38431 ed73e79a0eb4
parent 37649 3809534d4531
child 37972 e1fa5c2e62a0
permissions -rw-r--r--
8157068: ExceptionInInitializerError if images build patched to use exploded version of jdk.internal.module.SystemModules Reviewed-by: alanb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     1
#
30094
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
     2
# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     4
#
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    10
#
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    15
# accompanied this code).
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    16
#
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    20
#
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    23
# questions.
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    24
#
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    25
24411
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    26
# This file contains targets and utilities needed by JPRT.
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    27
24411
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    28
# Cygpath is only defined when running on Cygwin
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    29
ifneq ($(CYGPATH), )
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    30
  # If we get JPRT_ARCHIVE_*BUNDLE externally, make sure they have /cygdrive
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    31
  # style paths
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    32
  ifdef JPRT_ARCHIVE_BUNDLE
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    33
    override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE))
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    34
  endif
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    35
  ifdef JPRT_ARCHIVE_INSTALL_BUNDLE
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    36
    override JPRT_ARCHIVE_INSTALL_BUNDLE := \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    37
        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE))
24411
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    38
  endif
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    39
  ifdef JPRT_ARCHIVE_MODULES_BUNDLE
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    40
    override JPRT_ARCHIVE_MODULES_BUNDLE := \
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    41
        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_MODULES_BUNDLE))
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    42
  endif
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    43
  ifdef JPRT_ARCHIVE_TEST_BUNDLE
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    44
    override JPRT_ARCHIVE_TEST_BUNDLE := \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    45
        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    46
  endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    47
  ifdef JPRT_ARCHIVE_SYMBOLS_BUNDLE
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    48
    override JPRT_ARCHIVE_SYMBOLS_BUNDLE := \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    49
        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_SYMBOLS_BUNDLE))
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    50
  endif
24411
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    51
endif
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    52
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    53
# When running in JPRT these will be provided. Need defaults so that this makefile
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    54
# is valid anyway.
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    55
ifndef JPRT_ARCHIVE_BUNDLE
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 30094
diff changeset
    56
  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/jdk-image.zip
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    57
endif
15083
0d22bc048353 8006797: build-infra JPRT builds need JPRT_ARCHIVE_INSTALL_BUNDLE in common/makefiles/Jprt.gmk
tbell
parents: 15082
diff changeset
    58
ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
    59
  JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
15083
0d22bc048353 8006797: build-infra JPRT builds need JPRT_ARCHIVE_INSTALL_BUNDLE in common/makefiles/Jprt.gmk
tbell
parents: 15082
diff changeset
    60
endif
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    61
ifndef JPRT_ARCHIVE_MODULES_BUNDLE
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    62
  JPRT_ARCHIVE_MODULES_BUNDLE=/tmp/jprt_bundles/modules.zip
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    63
endif
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    64
ifndef JPRT_ARCHIVE_TEST_BUNDLE
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    65
  JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    66
endif
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    67
ifndef JPRT_ARCHIVE_SYMBOLS_BUNDLE
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    68
  JPRT_ARCHIVE_SYMBOLS_BUNDLE=/tmp/jprt_bundles/symbols-image.zip
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    69
endif
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    70
25708
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    71
ifeq ($(SKIP_BOOT_CYCLE), false)
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    72
  jprt_bundle: bootcycle-images
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    73
endif
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    74
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    75
# This target must be called in the context of a SPEC file
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    76
jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) $(JPRT_ARCHIVE_TEST_BUNDLE) \
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    77
    $(JPRT_ARCHIVE_MODULES_BUNDLE)
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    78
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    79
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    80
  jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    81
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    82
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    83
# This target must be called in the context of a SPEC file
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    84
$(JPRT_ARCHIVE_BUNDLE): bundles
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    85
	$(MKDIR) -p $(@D)
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    86
	$(RM) $@
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
    87
	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    88
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    89
$(JPRT_ARCHIVE_MODULES_BUNDLE): bundles
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    90
	$(MKDIR) -p $(@D)
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    91
	$(RM) $@
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    92
	$(CP) $(BUILD_OUTPUT)/bundles/modules.zip $@
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
    93
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    94
$(JPRT_ARCHIVE_TEST_BUNDLE): bundles
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    95
	$(MKDIR) -p $(@D)
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    96
	$(RM) $@
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    97
	$(CP) $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip $@
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    98
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    99
$(JPRT_ARCHIVE_SYMBOLS_BUNDLE): bundles
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   100
	$(MKDIR) -p $(@D)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   101
	$(RM) $@
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   102
	$(CP) $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip $@
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   103
20047
daafff583fd7 8023495: [infra] create 64-bit solaris bits with symlinks
ksrini
parents: 17667
diff changeset
   104
SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
daafff583fd7 8023495: [infra] create 64-bit solaris bits with symlinks
ksrini
parents: 17667
diff changeset
   105
SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
   106
SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR)
30094
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   107
SRC_JDK_MACOSX_BUNDLE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   108
SRC_JRE_MACOSX_BUNDLE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   109
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   110
# Bundle up the images
37649
3809534d4531 8154841: Let different Jib profiles have different default make targets
erikj
parents: 37402
diff changeset
   111
JPRT_TARGET ?= default
3809534d4531 8154841: Let different Jib profiles have different default make targets
erikj
parents: 37402
diff changeset
   112
ifeq ($(JPRT_TARGET), default)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   113
  bundles: $(JPRT_TARGET)
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   114
	@$(call TargetEnter)
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   115
	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   116
	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   117
	    $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   118
	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   119
	    $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   120
	$(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   121
	    $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip .
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
   122
	$(CD) $(IMAGES_OUTPUTDIR)/jmods && $(ZIP) -y -q -r \
17612cee3530 8142968: Module System implementation
alanb
parents: 34102
diff changeset
   123
	    $(BUILD_OUTPUT)/bundles/modules.zip .
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
   124
	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   125
	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   126
	      $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   127
	fi
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   128
	if [ -d $(SYMBOLS_IMAGE_DIR) ] ; then \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   129
	  $(CD) $(SYMBOLS_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   130
	      $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip . ; \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
   131
	fi
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   132
	@$(call TargetExit)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   133
else
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   134
  # Just fake the bundles
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   135
  bundles: $(JPRT_TARGET)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   136
	@$(call TargetEnter)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   137
	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   138
	$(CD) $(TOPDIR) &&  $(ZIP) -y -q -r \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   139
	    $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip README
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   140
	$(CD) $(TOPDIR) &&  $(ZIP) -y -q -r \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   141
	    $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip README
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   142
	$(CD) $(TOPDIR) &&  $(ZIP) -y -q -r \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   143
	    $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip README
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   144
	$(CD) $(TOPDIR) &&  $(ZIP) -y -q -r \
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   145
	    $(BUILD_OUTPUT)/bundles/modules.zip README
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   146
	@$(call TargetExit)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   147
endif
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   148
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   149
# Copy images to one unified location regardless of platform etc.
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36506
diff changeset
   150
final-images: $(JPRT_TARGET)
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   151
	@$(call TargetEnter)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   152
	$(RM) -r $(BUILD_OUTPUT)/final-images
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   153
	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   154
	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   155
	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   156
	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
   157
        ifeq ($(OPENJDK_TARGET_OS),macosx)
30094
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   158
	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_MACOSX_BUNDLE_SUBDIR)
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   159
	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_MACOSX_BUNDLE_SUBDIR)
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   160
	  $(CP) -R -P $(SRC_JDK_MACOSX_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_MACOSX_BUNDLE_SUBDIR)/
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   161
	  $(CP) -R -P $(SRC_JRE_MACOSX_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_MACOSX_BUNDLE_SUBDIR)/
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
   162
        endif
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   163
	@$(call TargetExit)
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   164
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29305
diff changeset
   165
ALL_TARGETS += jprt_bundle bundles final-images