make/Jprt.gmk
author sgehwolf
Mon, 15 Jun 2015 11:50:16 +0200
changeset 31350 b856c6918480
parent 30094 bc3b5dbd8931
child 34102 c0a98357f847
permissions -rw-r--r--
8098552: 8079792 breaks Zero builds without precompiled headers. Summary: Include memRegion.hpp in g1BiasedArray.hpp Reviewed-by: ehelin, sjohanss
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
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    39
  ifdef JPRT_ARCHIVE_TEST_BUNDLE
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    40
    override JPRT_ARCHIVE_TEST_BUNDLE := \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    41
        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE))
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    42
  endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    43
  ifdef JPRT_ARCHIVE_SYMBOLS_BUNDLE
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    44
    override JPRT_ARCHIVE_SYMBOLS_BUNDLE := \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    45
        $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_SYMBOLS_BUNDLE))
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    46
  endif
24411
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    47
endif
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    48
54baaf3fa2ca 8043127: Convert JPRT_ARCHIVE_BUNDLE to unix style paths
erikj
parents: 22031
diff changeset
    49
# 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
    50
# is valid anyway.
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    51
ifndef JPRT_ARCHIVE_BUNDLE
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    52
  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    53
endif
15083
0d22bc048353 8006797: build-infra JPRT builds need JPRT_ARCHIVE_INSTALL_BUNDLE in common/makefiles/Jprt.gmk
tbell
parents: 15082
diff changeset
    54
ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
    55
  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
    56
endif
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    57
ifndef JPRT_ARCHIVE_TEST_BUNDLE
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    58
  JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    59
endif
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    60
ifndef JPRT_ARCHIVE_SYMBOLS_BUNDLE
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    61
  JPRT_ARCHIVE_SYMBOLS_BUNDLE=/tmp/jprt_bundles/symbols-image.zip
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    62
endif
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    63
25708
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    64
ifeq ($(SKIP_BOOT_CYCLE), false)
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    65
  jprt_bundle: bootcycle-images
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    66
endif
7ef7f2129ede 8054009: Support SKIP_BOOT_CYCLE=false when invoked from JPRT
mikael
parents: 24411
diff changeset
    67
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    68
# This target must be called in the context of a SPEC file
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    69
jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) $(JPRT_ARCHIVE_TEST_BUNDLE)
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    70
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    71
ifeq ($(GCOV_ENABLED), true)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    72
  jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    73
endif
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
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
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    76
$(JPRT_ARCHIVE_BUNDLE): bundles
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    77
	$(MKDIR) -p $(@D)
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    78
	$(RM) $@
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
    79
	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    80
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    81
$(JPRT_ARCHIVE_TEST_BUNDLE): bundles
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    82
	$(MKDIR) -p $(@D)
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    83
	$(RM) $@
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    84
	$(CP) $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip $@
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    85
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    86
$(JPRT_ARCHIVE_SYMBOLS_BUNDLE): bundles
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    87
	$(MKDIR) -p $(@D)
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    88
	$(RM) $@
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    89
	$(CP) $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip $@
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
    90
20047
daafff583fd7 8023495: [infra] create 64-bit solaris bits with symlinks
ksrini
parents: 17667
diff changeset
    91
SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
daafff583fd7 8023495: [infra] create 64-bit solaris bits with symlinks
ksrini
parents: 17667
diff changeset
    92
SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
28285
3b8c4ccbb332 8067759: Create initial test bundle framework
ihse
parents: 25854
diff changeset
    93
SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR)
30094
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
    94
SRC_JDK_MACOSX_BUNDLE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
    95
SRC_JRE_MACOSX_BUNDLE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
    96
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
    97
# Bundle up the images
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25708
diff changeset
    98
bundles: all
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
    99
	@$(call TargetEnter)
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   100
	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   101
	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   102
	    $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   103
	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   104
	    $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   105
	$(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   106
	    $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip .
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
   107
	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
29305
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   108
	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   109
	      $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   110
	fi
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   111
	if [ -d $(SYMBOLS_IMAGE_DIR) ] ; then \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   112
	  $(CD) $(SYMBOLS_IMAGE_DIR) && $(ZIP) -y -q -r \
4ddc6faf7842 8073021: add native code coverage target into makefiles
erikj
parents: 28285
diff changeset
   113
	      $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip . ; \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20047
diff changeset
   114
	fi
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   115
	@$(call TargetExit)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   116
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   117
# Copy images to one unified location regardless of platform etc.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25708
diff changeset
   118
final-images: all
15396
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   119
	@$(call TargetEnter)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   120
	$(RM) -r $(BUILD_OUTPUT)/final-images
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   121
	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   122
	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
57dde7448b3f 8007275: build-infra: Create final-images target
erikj
parents: 15083
diff changeset
   123
	$(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
   124
	$(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
   125
        ifeq ($(OPENJDK_TARGET_OS),macosx)
30094
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   126
	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_MACOSX_BUNDLE_SUBDIR)
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   127
	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_MACOSX_BUNDLE_SUBDIR)
bc3b5dbd8931 8078058: Clean up mac bundles logic
ihse
parents: 29662
diff changeset
   128
	  $(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
   129
	  $(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
   130
        endif
15053
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   131
	@$(call TargetExit)
64278cb83950 8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile
erikj
parents:
diff changeset
   132
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29305
diff changeset
   133
ALL_TARGETS += jprt_bundle bundles final-images