jdk/make/CopyFiles.gmk
author sspitsyn
Fri, 17 Jan 2014 02:13:40 -0800
changeset 22519 924605caa9a8
parent 21805 c7d7946239de
child 22963 a28e6f0b511b
permissions -rw-r--r--
8030027: nsk/jvmti/scenarios/hotswap/HS101/hs101t006 Crashed the vm on Linux-amd64: SIGSEGV in JavaThread::last_java_vframe(RegisterMap*)+0xfa Summary: Add a safe guard to VMOp_GetCurrentLocation against non-walkable stack of target thread exiting from Java execution Reviewed-by: mgronlun, dholmes, sla, dcubed Contributed-by: serguei.spitsyn@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
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
INCLUDEDIR = $(JDK_OUTPUTDIR)/include
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    27
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    28
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    30
ifeq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    31
  OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    32
else ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    33
  OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    34
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    35
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    37
# Copy exported header files to outputdir.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    38
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    39
H_TARGET_FILES = $(INCLUDEDIR)/jdwpTransport.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    40
    $(INCLUDEDIR)/jni.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    41
    $(INCLUDEDIR)/jvmti.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    42
    $(INCLUDEDIR)/jvmticmlr.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    43
    $(INCLUDEDIR)/classfile_constants.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    44
    $(INCLUDEDIR)/jawt.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    45
    $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    46
    $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    48
$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
    49
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
21129
e1f4474a6723 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20899
diff changeset
    51
$(OPENJDK_TARGET_OS_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_EXPORT_DIR)/javavm/export/%.h
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
    52
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    53
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    54
COPY_FILES = $(H_TARGET_FILES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    56
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    57
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    58
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    59
  ifeq ($(OPENJDK_TARGET_OS), windows)
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    60
    COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    61
        $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    62
        $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    63
        $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    64
        $(JDK_OUTPUTDIR)/lib/accessibility.properties
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    65
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    66
    $(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    67
        $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/%
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    68
		$(install-file)
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    69
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    70
    $(JDK_OUTPUTDIR)/lib/accessibility.properties: \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    71
        $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    72
		$(install-file)
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    73
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
    74
  endif
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    75
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    76
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    77
##########################################################################################
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14759
diff changeset
    78
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    79
LIBDIR = $(JDK_OUTPUTDIR)/lib
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    80
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
MGMT_LIBDIR = $(LIBDIR)/management
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
MGMT_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/management
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
MGMT_SRC_FILES = $(wildcard $(MGMT_LIB_SRC)/*)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    84
MGMT_TARGET_FILES = $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    85
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    86
$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
    87
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
	$(CHMOD) 644 $@
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    89
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    90
# this file has different permissions...don't know why...
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    91
$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
    92
	$(call install-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    93
	$(CHMOD) 644 $@
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    94
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    95
$(MGMT_LIBDIR)/%: $(MGMT_LIB_SRC)/%
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
    96
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
	$(CHMOD) 444 $@
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    98
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
COPY_FILES += $(MGMT_TARGET_FILES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   100
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   101
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   102
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
LOGGING_LIB_SRC = $(JDK_TOPDIR)/src/share/lib
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   104
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
$(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   106
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   108
COPY_FILES += $(LIBDIR)/logging.properties
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   109
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   110
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
# Copy property files from sun/print to LIBDIR
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   113
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
PSFONTPROPFILE_SRC_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   115
PSFONTPROPFILE_SRCS = $(wildcard $(PSFONTPROPFILE_SRC_DIR)/*.properties*)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   116
PSFONTPROPFILE_TARGET_FILES = $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFONTPROPFILE_SRCS))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   117
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   118
$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   119
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   120
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   121
COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   122
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   123
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   124
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   125
# Copy flavormap.properties, cursor.properties and cursors gif files to LIBDIR
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   126
#
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   127
ifneq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   128
  OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   129
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   130
  OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   131
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   132
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   133
$(LIBDIR)/flavormap.properties: $(OPENJDK_TARGET_OS_LIB_SRC)/flavormap.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   134
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   135
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   136
COPY_FILES += $(LIBDIR)/flavormap.properties
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   137
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   138
CURSORS_DEST_DIR = $(LIBDIR)/images/cursors
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   139
CURSORS_OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib/images/cursors
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   141
$(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   142
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   144
COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   145
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   146
CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   147
ifeq ($(OPENJDK_TARGET_OS), windows)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   148
  CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   149
else # OPENJDK_TARGET_OS
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   150
  CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   151
endif # OPENJDK_TARGET_OS
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   152
CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   153
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   154
$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/%
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   155
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   156
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   157
COPY_FILES += $(CURSORS_TARGET_FILES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   160
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   161
CONTENT_TYPES_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   162
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   163
$(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   164
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   166
COPY_FILES += $(LIBDIR)/content-types.properties
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   167
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   168
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   169
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   170
CALENDARS_SRC := $(JDK_TOPDIR)/src/share/lib
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   171
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   172
$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   173
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   174
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   175
COPY_FILES += $(LIBDIR)/calendars.properties
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   176
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   177
$(LIBDIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   178
	$(MKDIR) -p $(@D)
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   179
	$(RM) $@
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   180
	$(CP) $< $@
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   181
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   182
COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 16636
diff changeset
   183
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   184
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   185
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   186
ifeq ($(OPENJDK_TARGET_OS), windows)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   187
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   188
  TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   189
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   190
  $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   191
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   192
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   193
  COPY_FILES += $(LIBDIR)/tzmappings
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   194
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   195
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   196
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   197
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   198
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   199
ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   200
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   201
ifdef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   202
  ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
   203
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   204
  ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   205
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   206
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   207
ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   208
ICCPROFILE_TARGET_FILES := $(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   209
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   210
$(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   211
	$(call install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   212
	$(CHMOD) 444 $@
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   213
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   214
COPY_FILES += $(ICCPROFILE_TARGET_FILES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   215
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   216
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   217
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   218
ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   219
  # We need to bundle the freetype library, so it will be available at runtime as well as link time.
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   220
  #
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   221
  # NB: Default freetype build system uses -h linker option and
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   222
  # result .so contains hardcoded library name that is later
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   223
  # used for adding dependencies to other objects
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   224
  # (e.g. libfontmanager.so).
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   225
  #
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   226
  # It is not obvious how to extract that hardcoded name (libfreetype.so.6)
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   227
  # without overcomplicating logic here.
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   228
  # To workaround this we hardcode .6 suffix for now.
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   229
  #
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   230
  # Note that .so.6 library will not be found by System.loadLibrary()
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   231
  # but fortunately we need to load FreeType library explicitly
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   232
  # on windows only
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   233
  #
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   234
  #TODO: rework this to avoid hardcoding library name in the makefile
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   235
  #
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   236
  ifeq ($(OPENJDK_TARGET_OS), windows)
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   237
    FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   238
  else
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   239
    FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   240
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   241
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   242
  $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   243
	$(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   244
        ifeq ($(OPENJDK_BUILD_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   245
	  $(CHMOD) +rx $@
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   246
        endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   247
20899
3ff530a51a1b 8001922: Improve freetype handling.
ihse
parents: 20884
diff changeset
   248
  COPY_FILES += $(FREETYPE_TARGET_LIB)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   249
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   250
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   251
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   252
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   253
# Copy msvcrXX.dll on windows
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   254
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   255
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   256
  MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   257
  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   258
  $(MSVCR_TARGET): $(MSVCR_DLL)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   259
	$(call install-file)
15340
b498be4dc7ff 8006873: SWAT-b74 msvcr100.dll does not have the permission for all
erikj
parents: 15148
diff changeset
   260
	$(CHMOD) a+rx $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   261
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   262
  COPY_FILES += $(MSVCR_TARGET)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   263
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   264
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   265
##########################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   266
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   267
HPROF_SRC = $(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   268
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   269
$(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   270
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   271
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   272
COPY_FILES += $(LIBDIR)/jvm.hprof.txt
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   273
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   274
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   275
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   276
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   277
# How to install jvm.cfg.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   278
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   279
ifeq ($(JVM_VARIANT_ZERO), true)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   280
  JVMCFG_ARCH := zero
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   281
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   282
  JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   283
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   284
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   285
ifeq ($(OPENJDK_TARGET_OS), macosx)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   286
  JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   287
else
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   288
  JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   289
endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   290
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   291
JVMCFG := $(JVMCFG_DIR)/jvm.cfg
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   292
19449
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   293
# To do: should this also support -zeroshark?
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   294
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   295
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
19449
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   296
  COPY_JVM_CFG_FILE := true
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   297
else
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   298
  # On 32-bit machines we have three potential VMs: client, server and minimal.
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   299
  # Historically we usually have both client and server and so that is what the
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   300
  # committed jvm.cfg expects (including platform specific ergonomics switches
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   301
  # to decide whether to use client or server by default). So when we have anything
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   302
  # other than client and server we need to define a new jvm.cfg file.
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   303
  # The main problem is deciding whether to use aliases for the VMs that are not
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   304
  # present and the current position is that we add aliases for client and server, but
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   305
  # not for minimal.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   306
  CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT)))
19449
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   307
  ifeq ($(CLIENT_AND_SERVER), true)
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   308
    COPY_JVM_CFG_FILE := true
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   309
  else
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   310
    # For zero, the default jvm.cfg file is sufficient
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   311
    ifeq ($(JVM_VARIANT_ZERO), true)
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   312
      COPY_JVM_CFG_FILE := true
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   313
    endif
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   314
  endif
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   315
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   316
19449
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   317
ifeq ($(COPY_JVM_CFG_FILE), true)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   318
  $(JVMCFG): $(JVMCFG_SRC)
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   319
	$(call install-file)
19449
902faa8c77ab 8023480: Create a jvm.cfg for zero on 32 bit architectures
omajid
parents: 18297
diff changeset
   320
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   321
  $(JVMCFG):
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   322
	$(MKDIR) -p $(@D)
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   323
	$(RM) $(@)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   324
        # Now check for other permutations
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   325
        ifeq ($(JVM_VARIANT_SERVER), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   326
	  $(PRINTF) "-server KNOWN\n">>$(@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   327
	  $(PRINTF) "-client ALIASED_TO -server\n">>$(@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   328
          ifeq ($(JVM_VARIANT_MINIMAL1), true)
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   329
	    $(PRINTF) "-minimal KNOWN\n">>$(@)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   330
          endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   331
        else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   332
          ifeq ($(JVM_VARIANT_CLIENT), true)
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   333
	    $(PRINTF) "-client KNOWN\n">>$(@)
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   334
	    $(PRINTF) "-server ALIASED_TO -client\n">>$(@)
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   335
            ifeq ($(JVM_VARIANT_MINIMAL1), true)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   336
	      $(PRINTF) "-minimal KNOWN\n">>$(@)
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   337
            endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   338
          else
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   339
            ifeq ($(JVM_VARIANT_MINIMAL1), true)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   340
	      $(PRINTF) "-minimal KNOWN\n">>$(@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   341
	      $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   342
	      $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
17192
047dd06efe8f 8010280: jvm.cfg needs updating for non-server builds
dholmes
parents: 16852
diff changeset
   343
            endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   344
          endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   345
        endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   346
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   347
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   348
COPY_FILES += $(JVMCFG)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   349
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   350
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   351
14759
3c8434051b3e 8004491: Build breakage on Linux due to 8004188
alanb
parents: 14231
diff changeset
   352
PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   353
PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   354
20774
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   355
ifndef OPENJDK
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   356
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   357
RESTRICTED_PKGS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/restricted.pkgs
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   358
RESTRICTED_PKGS := $(shell $(CAT) $(RESTRICTED_PKGS_SRC) | $(TR) "\n" " ")
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   359
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   360
$(PROPS_DST): $(PROPS_SRC)
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   361
	$(MKDIR) -p $(@D)
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   362
	$(TOOL_ADDTORESTRICTEDPKGS) $^ $@.tmp $(RESTRICTED_PKGS)
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   363
	$(MV) $@.tmp $@
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   364
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   365
else
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   366
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   367
$(PROPS_DST): $(PROPS_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   368
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   369
20774
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   370
endif
330ea6efa3fd 8007292: Add JavaFX internal packages to package.access
mullan
parents: 20177
diff changeset
   371
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   372
COPY_FILES += $(PROPS_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   373
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   374
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   375
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   376
POLICY_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.policy
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   377
POLICY_DST := $(JDK_OUTPUTDIR)/lib/security/java.policy
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   378
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   379
$(POLICY_DST): $(POLICY_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   380
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   381
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   382
COPY_FILES += $(POLICY_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   383
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   384
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   385
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   386
CACERTS_SRC := $(CACERTS_FILE)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   387
CACERTS_DST := $(JDK_OUTPUTDIR)/lib/security/cacerts
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   388
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   389
$(CACERTS_DST): $(CACERTS_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   390
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   391
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   392
COPY_FILES += $(CACERTS_DST)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   393
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   394
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   395
20177
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   396
BLACKLISTED_CERTS_SRC := $(JDK_TOPDIR)/src/share/lib/security/blacklisted.certs
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   397
BLACKLISTED_CERTS_DST := $(JDK_OUTPUTDIR)/lib/security/blacklisted.certs
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   398
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   399
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   400
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   401
  BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   402
  BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   403
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   404
  BLACKLISTED_CERTS_SRC += $(wildcard $(JDK_TOPDIR)/src/closed/share/lib/security/blacklisted.certs)
20177
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   405
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   406
  TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   407
  TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   408
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   409
  $(BLACKLIST_DST): $(BLACKLIST_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   410
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   411
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   412
  COPY_FILES += $(BLACKLIST_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   413
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   414
  $(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   415
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   416
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   417
  COPY_FILES += $(TRUSTEDLIBS_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   418
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   419
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   420
20177
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   421
$(BLACKLISTED_CERTS_DST): $(BLACKLISTED_CERTS_SRC)
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   422
	$(MKDIR) -p $(@D)
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   423
	$(CAT) $^ | $(SED) '/^$$/d' | $(SORT) | $(UNIQ) > $@.tmp
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   424
	$(GREP) -i Algorithm $@.tmp > $@
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   425
	if [ `$(SED) -n -e "$$=" $@` != 1 ]; then \
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   426
	   $(ECHO) "Different algorithms defined in $^"; \
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   427
	   $(RM) $@ $@.tmp; \
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   428
	   false; \
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   429
	fi
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   430
	$(GREP) -iv Algorithm $@.tmp >> $@
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   431
	$(RM) $@.tmp
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   432
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   433
COPY_FILES += $(BLACKLISTED_CERTS_DST)
8ea486a4f36e 8011402: Move blacklisting certificate logic from hard code to data
weijun
parents: 19449
diff changeset
   434
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   435
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   436
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   437
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   438
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   439
  SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   440
  SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   441
  SHARED_FONTS_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   442
      LucidaTypewriterRegular.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   443
      LucidaTypewriterBold.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   444
      LucidaBrightRegular.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   445
      LucidaBrightDemiBold.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   446
      LucidaBrightItalic.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   447
      LucidaBrightDemiItalic.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   448
      LucidaSansRegular.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   449
      LucidaSansDemiBold.ttf \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   450
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   451
  SHARED_FONTS_SRC := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_SRC_DIR)/$(F))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   452
  SHARED_FONTS_DST := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_DST_DIR)/$(F))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   453
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   454
  $(SHARED_FONTS_DST_DIR)/%.ttf: $(SHARED_FONTS_SRC_DIR)/%.ttf
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   455
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   456
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   457
  $(SHARED_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   458
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   459
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   460
  COPY_FILES += $(SHARED_FONTS_DST)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   461
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   462
  ifneq ($(OPENJDK_TARGET_OS), windows)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   463
    COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   464
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   465
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   466
  ifeq ($(OPENJDK_TARGET_OS), linux)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   467
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   468
  # The oblique fonts are only needed/wanted on Linux.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   469
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   470
    OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   471
    OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   472
    OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   473
        LucidaSansOblique.ttf LucidaSansDemiOblique.ttf
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   474
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   475
    OBL_FONTS_SRC := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_SRC_DIR)/$(F))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   476
    OBL_FONTS_DST := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_DST_DIR)/$(F))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   477
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   478
    $(OBL_FONTS_DST_DIR)/%.ttf: $(OBL_FONTS_SRC_DIR)/%.ttf
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   479
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   480
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   481
    $(OBL_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   482
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   483
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   484
    COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   485
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   486
  endif # linux
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   487
endif # OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   488
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   489
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   490
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   491
ifndef OPENJDK
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   492
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   493
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   494
  # Solaris X11 Direct Graphics Access library
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   495
  #
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   496
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   497
  _DGALIBS_sparc = \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   498
      libxinerama.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   499
      libjdgaSUNWcg6.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   500
      libjdgaSUNWffb.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   501
      libjdgaSUNWm64.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   502
      libjdgaSUNWafb.so
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   503
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   504
  _DGALIBS_sparcv9 = \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   505
      libxinerama.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   506
      libjdgaSUNWcg6.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   507
      libjdgaSUNWffb.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   508
      libjdgaSUNWm64.so \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   509
      libjdgaSUNWafb.so
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   510
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   511
  _DGALIBS_i586 = # no i586 library yet
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   512
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   513
  _DGALIBS_amd64 = # no amd64 library yet
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   514
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   515
  DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   516
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   517
  $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   518
	$(call install-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   519
	$(CHMOD) 755 $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   520
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   521
  $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   522
	$(call install-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   523
	$(CHMOD) 755 $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   524
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   525
  $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   526
	$(MKDIR) -p $(@D)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   527
	$(RM) $@
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   528
	$(LN) -s $(<F) $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   529
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   530
  COPY_FILES += $(DGALIBS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   531
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   532
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   533
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   534
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   535
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   536
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   537
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   538
  SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   539
  SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   540
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   541
  $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   542
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   543
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   544
  COPY_FILES += $(SUNPKCS11_CFG_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   545
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   546
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   547
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   548
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   549
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   550
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   551
  ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   552
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   553
    UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/ucrypto-solaris.cfg
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   554
    UCRYPTO_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/ucrypto-solaris.cfg
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   555
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   556
    $(UCRYPTO_CFG_DST): $(UCRYPTO_CFG_SRC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   557
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   558
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   559
    COPY_FILES += $(UCRYPTO_CFG_DST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   560
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   561
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   562
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   563
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   564
##########################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   565
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20177
diff changeset
   566
$(JDK_OUTPUTDIR)/lib/sound.properties: $(JDK_TOPDIR)/src/share/lib/sound.properties
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16507
diff changeset
   567
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   568
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   569
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   570
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   571
##########################################################################################
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
   572
18297
48432b1bbd63 8017480: Move copying of jfr files to closed makefile
erikj
parents: 18030
diff changeset
   573
-include $(CUSTOM_MAKE_DIR)/CopyFiles.gmk