author | michaelm |
Thu, 24 Oct 2013 20:39:21 +0100 | |
changeset 22339 | e91bfaf4360d |
parent 21805 | c7d7946239de |
child 22963 | a28e6f0b511b |
permissions | -rw-r--r-- |
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 | 27 |
|
13164 | 28 |
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
29 |
|
13164 | 30 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
20547 | 31 |
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32 |
13164 | 32 |
else ifeq ($(OPENJDK_TARGET_OS), macosx) |
20547 | 33 |
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin |
12892 | 34 |
endif |
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 | 39 |
H_TARGET_FILES = $(INCLUDEDIR)/jdwpTransport.h \ |
40 |
$(INCLUDEDIR)/jni.h \ |
|
41 |
$(INCLUDEDIR)/jvmti.h \ |
|
42 |
$(INCLUDEDIR)/jvmticmlr.h \ |
|
43 |
$(INCLUDEDIR)/classfile_constants.h \ |
|
44 |
$(INCLUDEDIR)/jawt.h \ |
|
45 |
$(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \ |
|
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 | 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 | 61 |
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \ |
62 |
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \ |
|
63 |
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \ |
|
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 | 67 |
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/% |
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 | 71 |
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties |
72 |
$(install-file) |
|
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14759
diff
changeset
|
73 |
|
20547 | 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 | 90 |
# this file has different permissions...don't know why... |
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 | 93 |
$(CHMOD) 644 $@ |
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 | 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 | 127 |
ifneq ($(OPENJDK_TARGET_OS), macosx) |
20547 | 128 |
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib |
13164 | 129 |
else |
20547 | 130 |
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib |
13164 | 131 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
132 |
|
13164 | 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 | 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 | 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 | 147 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
20547 | 148 |
CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif) |
13164 | 149 |
else # OPENJDK_TARGET_OS |
20547 | 150 |
CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif) |
13164 | 151 |
endif # OPENJDK_TARGET_OS |
20547 | 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 | 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 | 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 | 170 |
CALENDARS_SRC := $(JDK_TOPDIR)/src/share/lib |
171 |
||
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 | 174 |
|
175 |
COPY_FILES += $(LIBDIR)/calendars.properties |
|
176 |
||
16852 | 177 |
$(LIBDIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties |
178 |
$(MKDIR) -p $(@D) |
|
179 |
$(RM) $@ |
|
180 |
$(CP) $< $@ |
|
181 |
||
182 |
COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties |
|
183 |
||
12892 | 184 |
########################################################################################## |
185 |
||
20547 | 186 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
12892 | 187 |
|
20547 | 188 |
TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib |
12892 | 189 |
|
20547 | 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 | 192 |
|
20547 | 193 |
COPY_FILES += $(LIBDIR)/tzmappings |
12892 | 194 |
|
195 |
endif |
|
196 |
||
197 |
########################################################################################## |
|
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 | 202 |
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms |
18030 | 203 |
else |
20547 | 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 | 207 |
ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf) |
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 | 218 |
ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) |
219 |
# We need to bundle the freetype library, so it will be available at runtime as well as link time. |
|
220 |
# |
|
221 |
# NB: Default freetype build system uses -h linker option and |
|
222 |
# result .so contains hardcoded library name that is later |
|
223 |
# used for adding dependencies to other objects |
|
224 |
# (e.g. libfontmanager.so). |
|
225 |
# |
|
226 |
# It is not obvious how to extract that hardcoded name (libfreetype.so.6) |
|
227 |
# without overcomplicating logic here. |
|
228 |
# To workaround this we hardcode .6 suffix for now. |
|
229 |
# |
|
230 |
# Note that .so.6 library will not be found by System.loadLibrary() |
|
231 |
# but fortunately we need to load FreeType library explicitly |
|
232 |
# on windows only |
|
233 |
# |
|
234 |
#TODO: rework this to avoid hardcoding library name in the makefile |
|
235 |
# |
|
20547 | 236 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
20899 | 237 |
FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) |
20547 | 238 |
else |
20899 | 239 |
FREETYPE_TARGET_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 |
20547 | 240 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
241 |
|
20899 | 242 |
$(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) |
243 |
$(CP) $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ |
|
20547 | 244 |
ifeq ($(OPENJDK_BUILD_OS), windows) |
245 |
$(CHMOD) +rx $@ |
|
246 |
endif |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
247 |
|
20899 | 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 | 253 |
# Copy msvcrXX.dll on windows |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
254 |
|
20547 | 255 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
256 |
MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL)) |
|
257 |
# Chmod to avoid permission issues if bundles are unpacked on unix platforms. |
|
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 | 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 | 266 |
|
20547 | 267 |
HPROF_SRC = $(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt |
12892 | 268 |
|
20547 | 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 | 271 |
|
272 |
COPY_FILES += $(LIBDIR)/jvm.hprof.txt |
|
273 |
||
274 |
########################################################################################## |
|
275 |
||
276 |
# |
|
277 |
# How to install jvm.cfg. |
|
278 |
# |
|
279 |
ifeq ($(JVM_VARIANT_ZERO), true) |
|
20547 | 280 |
JVMCFG_ARCH := zero |
12892 | 281 |
else |
20547 | 282 |
JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY) |
12892 | 283 |
endif |
284 |
||
20547 | 285 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
12892 | 286 |
JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg |
287 |
else |
|
13702 | 288 |
JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg |
12892 | 289 |
endif |
13702 | 290 |
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) |
12892 | 291 |
JVMCFG := $(JVMCFG_DIR)/jvm.cfg |
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 | 294 |
|
20547 | 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 | 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 | 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 | 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 | 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 | 324 |
# Now check for other permutations |
325 |
ifeq ($(JVM_VARIANT_SERVER), true) |
|
326 |
$(PRINTF) "-server KNOWN\n">>$(@) |
|
327 |
$(PRINTF) "-client ALIASED_TO -server\n">>$(@) |
|
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 | 330 |
endif |
331 |
else |
|
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 | 336 |
$(PRINTF) "-minimal KNOWN\n">>$(@) |
17192
047dd06efe8f
8010280: jvm.cfg needs updating for non-server builds
dholmes
parents:
16852
diff
changeset
|
337 |
endif |
20547 | 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 | 340 |
$(PRINTF) "-minimal KNOWN\n">>$(@) |
341 |
$(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) |
|
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 | 344 |
endif |
12892 | 345 |
endif |
346 |
endif |
|
347 |
||
348 |
COPY_FILES += $(JVMCFG) |
|
349 |
||
350 |
########################################################################################## |
|
351 |
||
14759 | 352 |
PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-$(OPENJDK_TARGET_OS) |
12892 | 353 |
PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security |
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 | 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 | 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 | 372 |
COPY_FILES += $(PROPS_DST) |
373 |
||
374 |
########################################################################################## |
|
375 |
||
376 |
POLICY_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.policy |
|
377 |
POLICY_DST := $(JDK_OUTPUTDIR)/lib/security/java.policy |
|
378 |
||
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 | 381 |
|
382 |
COPY_FILES += $(POLICY_DST) |
|
383 |
||
384 |
########################################################################################## |
|
385 |
||
386 |
CACERTS_SRC := $(CACERTS_FILE) |
|
387 |
CACERTS_DST := $(JDK_OUTPUTDIR)/lib/security/cacerts |
|
388 |
||
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 | 391 |
|
392 |
COPY_FILES += $(CACERTS_DST) |
|
393 |
||
394 |
########################################################################################## |
|
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 | 399 |
ifndef OPENJDK |
400 |
||
20547 | 401 |
BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist |
402 |
BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist |
|
12892 | 403 |
|
20547 | 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 | 406 |
TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries |
407 |
TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries |
|
12892 | 408 |
|
20547 | 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 | 411 |
|
20547 | 412 |
COPY_FILES += $(BLACKLIST_DST) |
12892 | 413 |
|
20547 | 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 | 416 |
|
20547 | 417 |
COPY_FILES += $(TRUSTEDLIBS_DST) |
12892 | 418 |
|
419 |
endif |
|
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 | 435 |
########################################################################################## |
436 |
||
437 |
ifndef OPENJDK |
|
438 |
||
20547 | 439 |
SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts |
440 |
SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts |
|
441 |
SHARED_FONTS_FILES := \ |
|
442 |
LucidaTypewriterRegular.ttf \ |
|
443 |
LucidaTypewriterBold.ttf \ |
|
444 |
LucidaBrightRegular.ttf \ |
|
445 |
LucidaBrightDemiBold.ttf \ |
|
446 |
LucidaBrightItalic.ttf \ |
|
447 |
LucidaBrightDemiItalic.ttf \ |
|
448 |
LucidaSansRegular.ttf \ |
|
449 |
LucidaSansDemiBold.ttf \ |
|
12892 | 450 |
|
20547 | 451 |
SHARED_FONTS_SRC := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_SRC_DIR)/$(F)) |
452 |
SHARED_FONTS_DST := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_DST_DIR)/$(F)) |
|
12892 | 453 |
|
20547 | 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 | 456 |
|
20547 | 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 | 459 |
|
20547 | 460 |
COPY_FILES += $(SHARED_FONTS_DST) |
13702 | 461 |
|
20547 | 462 |
ifneq ($(OPENJDK_TARGET_OS), windows) |
13702 | 463 |
COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir |
20547 | 464 |
endif |
12892 | 465 |
|
20547 | 466 |
ifeq ($(OPENJDK_TARGET_OS), linux) |
12892 | 467 |
|
20547 | 468 |
# The oblique fonts are only needed/wanted on Linux. |
12892 | 469 |
|
20547 | 470 |
OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique |
471 |
OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts |
|
472 |
OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \ |
|
473 |
LucidaSansOblique.ttf LucidaSansDemiOblique.ttf |
|
12892 | 474 |
|
20547 | 475 |
OBL_FONTS_SRC := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_SRC_DIR)/$(F)) |
476 |
OBL_FONTS_DST := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_DST_DIR)/$(F)) |
|
12892 | 477 |
|
20547 | 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 | 480 |
|
20547 | 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 | 483 |
|
20547 | 484 |
COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir |
12892 | 485 |
|
20547 | 486 |
endif # linux |
12892 | 487 |
endif # OPENJDK |
488 |
||
489 |
########################################################################################## |
|
490 |
||
491 |
ifndef OPENJDK |
|
492 |
||
20547 | 493 |
# |
494 |
# Solaris X11 Direct Graphics Access library |
|
495 |
# |
|
12892 | 496 |
|
20547 | 497 |
_DGALIBS_sparc = \ |
498 |
libxinerama.so \ |
|
499 |
libjdgaSUNWcg6.so \ |
|
500 |
libjdgaSUNWffb.so \ |
|
501 |
libjdgaSUNWm64.so \ |
|
502 |
libjdgaSUNWafb.so |
|
12892 | 503 |
|
20547 | 504 |
_DGALIBS_sparcv9 = \ |
505 |
libxinerama.so \ |
|
506 |
libjdgaSUNWcg6.so \ |
|
507 |
libjdgaSUNWffb.so \ |
|
508 |
libjdgaSUNWm64.so \ |
|
509 |
libjdgaSUNWafb.so |
|
12892 | 510 |
|
20547 | 511 |
_DGALIBS_i586 = # no i586 library yet |
12892 | 512 |
|
20547 | 513 |
_DGALIBS_amd64 = # no amd64 library yet |
12892 | 514 |
|
20547 | 515 |
DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%) |
12892 | 516 |
|
20547 | 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 | 519 |
$(CHMOD) 755 $@ |
12892 | 520 |
|
20547 | 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 | 523 |
$(CHMOD) 755 $@ |
12892 | 524 |
|
20547 | 525 |
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so |
12892 | 526 |
$(MKDIR) -p $(@D) |
527 |
$(RM) $@ |
|
14231 | 528 |
$(LN) -s $(<F) $@ |
12892 | 529 |
|
20547 | 530 |
COPY_FILES += $(DGALIBS) |
12892 | 531 |
|
532 |
endif |
|
533 |
||
534 |
########################################################################################## |
|
535 |
||
13164 | 536 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
12892 | 537 |
|
20547 | 538 |
SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg |
539 |
SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg |
|
12892 | 540 |
|
20547 | 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 | 543 |
|
20547 | 544 |
COPY_FILES += $(SUNPKCS11_CFG_DST) |
12892 | 545 |
|
546 |
endif |
|
547 |
||
548 |
########################################################################################## |
|
549 |
||
550 |
ifndef OPENJDK |
|
20547 | 551 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
12892 | 552 |
|
20547 | 553 |
UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/ucrypto-solaris.cfg |
554 |
UCRYPTO_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/ucrypto-solaris.cfg |
|
12892 | 555 |
|
20547 | 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 | 558 |
|
20547 | 559 |
COPY_FILES += $(UCRYPTO_CFG_DST) |
12892 | 560 |
|
20547 | 561 |
endif |
12892 | 562 |
endif |
563 |
||
564 |
########################################################################################## |
|
565 |
||
20547 | 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 | 568 |
|
569 |
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties |
|
570 |
||
571 |
########################################################################################## |
|
18030 | 572 |
|
18297
48432b1bbd63
8017480: Move copying of jfr files to closed makefile
erikj
parents:
18030
diff
changeset
|
573 |
-include $(CUSTOM_MAKE_DIR)/CopyFiles.gmk |