Print this page
rev 10447 : 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
Summary: Build system tweaks to allow building on OS X 10.9 and later
Reviewed-by: erikj
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/jdk/make/lib/PlatformLibraries.gmk
+++ new/jdk/make/lib/PlatformLibraries.gmk
1 1 #
2 2 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation. Oracle designates this
8 8 # particular file as subject to the "Classpath" exception as provided
9 9 # by Oracle in the LICENSE file that accompanied this code.
10 10 #
11 11 # This code is distributed in the hope that it will be useful, but WITHOUT
12 12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 14 # version 2 for more details (a copy is included in the LICENSE file that
15 15 # accompanied this code).
16 16 #
17 17 # You should have received a copy of the GNU General Public License version
18 18 # 2 along with this work; if not, write to the Free Software Foundation,
19 19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 20 #
21 21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 22 # or visit www.oracle.com if you need additional information or have any
23 23 # questions.
24 24 #
|
↓ open down ↓ |
24 lines elided |
↑ open up ↑ |
25 25
26 26 ifeq ($(OPENJDK_TARGET_OS), macosx)
27 27
28 28 $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \
29 29 LIBRARY := AppleScriptEngine, \
30 30 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
31 31 SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
32 32 LANG := C, \
33 33 OPTIMIZATION := LOW, \
34 34 CFLAGS := $(CFLAGS_JDKLIB) \
35 - -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \
36 - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
37 - -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
35 + -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
38 36 LDFLAGS := $(LDFLAGS_JDKLIB) \
39 37 $(call SET_SHARED_LIBRARY_ORIGIN), \
40 38 LDFLAGS_SUFFIX := -framework Cocoa \
41 39 -framework Carbon \
42 - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
43 40 -framework JavaNativeFoundation \
44 41 $(LDFLAGS_JDKLIB_SUFFIX), \
45 42 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
46 43 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
47 44
48 45 $(BUILD_LIBAPPLESCRIPTENGINE): $(BUILD_LIBJAVA)
49 46
50 47 BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
51 48
52 49 endif
53 50
54 51 ##########################################################################################
55 52
|
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
56 53 ifeq ($(OPENJDK_TARGET_OS), macosx)
57 54
58 55 $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \
59 56 LIBRARY := osxapp, \
60 57 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
61 58 SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
62 59 LANG := C, \
63 60 OPTIMIZATION := LOW, \
64 61 CFLAGS := $(CFLAGS_JDKLIB) \
65 62 -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
66 - -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
67 - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
68 - -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
63 + -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp, \
69 64 LDFLAGS := $(LDFLAGS_JDKLIB) \
70 65 $(call SET_SHARED_LIBRARY_ORIGIN), \
71 66 LDFLAGS_SUFFIX_macosx := \
72 67 -framework Accelerate \
73 68 -framework ApplicationServices \
74 69 -framework AudioToolbox \
75 70 -framework Carbon \
76 71 -framework Cocoa \
77 72 -framework Security \
78 73 -framework ExceptionHandling \
79 - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
80 74 -framework JavaNativeFoundation \
81 75 -framework JavaRuntimeSupport \
82 76 -framework OpenGL \
83 77 -framework IOSurface \
84 78 -framework QuartzCore, \
85 79 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxapp, \
86 80 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
87 81
88 82 BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
89 83
90 84 endif
91 85
92 86 ##########################################################################################
93 87
94 88 ifeq ($(OPENJDK_TARGET_OS), macosx)
95 89
96 90 LIBOSX_DIRS := \
97 91 $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \
98 92 $(JDK_TOPDIR)/src/macosx/native/java/util \
99 93 $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \
100 94 $(JDK_TOPDIR)/src/macosx/native/apple/security \
|
↓ open down ↓ |
11 lines elided |
↑ open up ↑ |
101 95 $(JDK_TOPDIR)/src/macosx/native/apple/launcher
102 96
103 97 $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \
104 98 LIBRARY := osx, \
105 99 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
106 100 SRC := $(LIBOSX_DIRS), \
107 101 LANG := C, \
108 102 OPTIMIZATION := LOW, \
109 103 CFLAGS := $(CFLAGS_JDKLIB) \
110 104 $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
111 - -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
112 - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
113 - -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
105 + -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
114 106 LDFLAGS := $(LDFLAGS_JDKLIB) \
115 107 $(call SET_SHARED_LIBRARY_ORIGIN), \
116 108 LDFLAGS_SUFFIX_macosx := \
117 109 -losxapp \
118 110 -framework Cocoa \
119 111 -framework ApplicationServices \
120 - -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
121 112 -framework JavaNativeFoundation \
122 113 -framework JavaRuntimeSupport \
123 114 -framework Security \
124 115 -framework SystemConfiguration \
125 116 $(LDFLAGS_JDKLIB_SUFFIX), \
126 117 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosx, \
127 118 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
128 119
129 120 BUILD_LIBRARIES += $(BUILD_LIBOSX)
130 121
131 122 $(BUILD_LIBOSX): $(BUILD_LIBOSXAPP)
132 123
133 124 $(BUILD_LIBOSX): $(BUILD_LIBJAVA)
134 125
135 126 endif
136 127
137 128 ##########################################################################################
138 129
139 130 ifndef OPENJDK
140 131 ifeq ($(OPENJDK_TARGET_OS), windows)
141 132
142 133 ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
143 134
144 135 define SetupAccessBridge
145 136 # Parameter 1 Suffix
146 137 # Parameter 2 Machine
147 138 # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
148 139
149 140 $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
150 141 LIBRARY = JAWTAccessBridge$1, \
151 142 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
152 143 SRC := $(ACCESSBRIDGE_SRCDIR), \
153 144 INCLUDE_FILES := JAWTAccessBridge.cpp, \
154 145 LANG := C++, \
155 146 OPTIMIZATION := LOW, \
156 147 CFLAGS := $(CFLAGS_JDKLIB) \
157 148 -DACCESSBRIDGE_ARCH_$3, \
158 149 LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
159 150 winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
160 151 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
161 152 -subsystem:windows -machine:$2 \
162 153 -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
163 154 VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
164 155 RC_FLAGS := $(RC_FLAGS) \
165 156 -D "JDK_FNAME=JAWTAccessBridge$1.dll" \
166 157 -D "JDK_INTERNAL_NAME=JAWTAccessBridge$1" \
167 158 -D "JDK_FTYPE=0x02L", \
168 159 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
169 160 DEBUG_SYMBOLS := true)
170 161
171 162 $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
172 163
173 164 $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1, \
174 165 LIBRARY = JavaAccessBridge$1, \
175 166 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
176 167 SRC := $(ACCESSBRIDGE_SRCDIR), \
177 168 INCLUDE_FILES := AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \
178 169 AccessBridgeJavaEntryPoints.cpp \
179 170 AccessBridgeMessages.cpp JavaAccessBridge.cpp, \
180 171 LANG := C++, \
181 172 OPTIMIZATION := LOW, \
182 173 CFLAGS := $(CFLAGS_JDKLIB) \
183 174 -DACCESSBRIDGE_ARCH_$3, \
184 175 LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
185 176 winspool.lib comdlg32.lib advapi32.lib shell32.lib \
186 177 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
187 178 -subsystem:windows -machine:$2 \
188 179 -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
189 180 VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
190 181 RC_FLAGS := $(RC_FLAGS) \
191 182 -D "JDK_FNAME=JavaAccessBridge$1.dll" \
192 183 -D "JDK_INTERNAL_NAME=JavaAccessBridge$1" \
193 184 -D "JDK_FTYPE=0x02L", \
194 185 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
195 186 DEBUG_SYMBOLS := true)
196 187
197 188 $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
198 189 LIBRARY = WindowsAccessBridge$1, \
199 190 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
200 191 SRC := $(ACCESSBRIDGE_SRCDIR), \
201 192 INCLUDE_FILES := AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \
202 193 AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \
203 194 WinAccessBridge.cpp AccessBridgeDebug.cpp \
204 195 AccessBridgeEventHandler.cpp, \
205 196 LANG := C++, \
206 197 OPTIMIZATION := LOW, \
207 198 CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
208 199 -DACCESSBRIDGE_ARCH_$3, \
209 200 LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
210 201 winspool.lib comdlg32.lib advapi32.lib shell32.lib \
211 202 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
212 203 -subsystem:windows -machine:$2 \
213 204 -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \
214 205 VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
215 206 RC_FLAGS := $(RC_FLAGS) \
216 207 -D "JDK_FNAME=WindowsAccessBridge$1.dll" \
217 208 -D "JDK_INTERNAL_NAME=WindowsAccessBridge$1" \
218 209 -D "JDK_FTYPE=0x02L", \
219 210 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
220 211 DEBUG_SYMBOLS := true)
221 212
222 213 BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
223 214 $$(BUILD_WINDOWSACCESSBRIDGE$1)
224 215
225 216 endef
226 217
227 218 ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
228 219 $(eval $(call SetupAccessBridge,-32,I386,32))
229 220 $(eval $(call SetupAccessBridge,,I386,LEGACY))
230 221 else
231 222 $(eval $(call SetupAccessBridge,-64,X64,64))
232 223 endif
233 224 endif
234 225 endif
|
↓ open down ↓ |
104 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX