author | jwilhelm |
Thu, 05 Nov 2015 20:00:53 +0100 | |
changeset 33661 | ad7c7378a002 |
parent 33653 | c1ee09fe3274 |
parent 33406 | 4680f7495292 |
child 33666 | 7908508d9e1c |
permissions | -rw-r--r-- |
25859 | 1 |
# |
29925
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
27953
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
25859 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
include NativeCompilation.gmk |
|
27 |
||
28 |
# Prepare the find cache. |
|
29 |
$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/java.base/share/native/launcher)) |
|
30 |
||
31 |
# When building a legacy overlay image (on solaris 64 bit), the launchers |
|
32 |
# need to be built with a different rpath and a different output dir. |
|
33 |
ifeq ($(OVERLAY_IMAGES), true) |
|
34 |
ORIGIN_ROOT := /../.. |
|
35 |
OUTPUT_SUBDIR := $(OPENJDK_TARGET_CPU_ISADIR) |
|
36 |
else |
|
37 |
ORIGIN_ROOT := /.. |
|
38 |
endif |
|
39 |
||
40 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
41 |
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN) |
|
42 |
else |
|
43 |
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) |
|
44 |
endif |
|
45 |
||
46 |
# |
|
47 |
# Applications expect to be able to link against libjawt without invoking |
|
48 |
# System.loadLibrary("jawt") first. This was the behaviour described in the |
|
49 |
# devloper documentation of JAWT and what worked with OpenJDK6. |
|
50 |
# |
|
51 |
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) |
|
52 |
ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) |
|
53 |
endif |
|
54 |
||
55 |
LAUNCHER_SRC := $(JDK_TOPDIR)/src/java.base/share/native/launcher |
|
56 |
LAUNCHER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/launcher \ |
|
57 |
-I$(JDK_TOPDIR)/src/java.base/share/native/libjli \ |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25859
diff
changeset
|
58 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \ |
25859 | 59 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \ |
60 |
# |
|
61 |
GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc |
|
62 |
JAVA_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.rc |
|
63 |
MACOSX_PLIST_DIR := $(JDK_TOPDIR)/src/java.base/macosx/native/launcher |
|
64 |
# Until the shuffle is permanent, we can't add this in configure |
|
65 |
CFLAGS_JDKEXE := $(filter-out %javavm/export, $(CFLAGS_JDKEXE)) |
|
66 |
CFLAGS_JDKEXE += -I$(JDK_TOPDIR)/src/java.base/share/native/include \ |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25859
diff
changeset
|
67 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include |
25859 | 68 |
CXXFLAGS_JDKEXE := $(filter-out %javavm/export, $(CXXFLAGS_JDKEXE)) |
69 |
CXXFLAGS_JDKEXE += -I$(JDK_TOPDIR)/src/java.base/share/native/include \ |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
25859
diff
changeset
|
70 |
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include |
25859 | 71 |
JAVA_MANIFEST := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.manifest |
72 |
||
73 |
define SetupLauncher |
|
74 |
# TODO: Fix mapfile on solaris. Won't work with ld as linker. |
|
75 |
# Parameter 1 is the name of the launcher (java, javac, jar...) |
|
76 |
# Parameter 2 is extra CFLAGS |
|
77 |
# Parameter 3 is extra LDFLAGS |
|
33406 | 78 |
# Parameter 4 is extra LIBS_unix |
79 |
# Parameter 5 is extra LIBS_windows |
|
25859 | 80 |
# Parameter 6 is optional Windows JLI library (full path) |
81 |
# Parameter 7 is optional Windows resource (RC) flags |
|
82 |
# Parameter 8 is optional Windows version resource file (.rc) |
|
83 |
# Parameter 9 is different output dir |
|
84 |
# Parameter 10 if set, link statically with c runtime on windows. |
|
85 |
# Parameter 11 if set, override plist file on macosx. |
|
86 |
$(call LogSetupMacroEntry,SetupLauncher($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11)) |
|
87 |
$(if $(13),$(error Internal makefile error: Too many arguments to SetupLauncher, please update CompileLaunchers.gmk)) |
|
88 |
||
27565 | 89 |
$1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib |
25859 | 90 |
ifneq ($6, ) |
91 |
$1_WINDOWS_JLI_LIB := $6 |
|
92 |
endif |
|
93 |
$1_VERSION_INFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE) |
|
94 |
ifneq ($8, ) |
|
95 |
$1_VERSION_INFO_RESOURCE := $8 |
|
96 |
endif |
|
97 |
||
98 |
$1_LDFLAGS := $3 |
|
33406 | 99 |
$1_LIBS := |
25859 | 100 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
101 |
$1_PLIST_FILE := Info-cmdline.plist |
|
102 |
ifneq ($(11), ) |
|
103 |
$1_PLIST_FILE := $(11) |
|
104 |
ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), ) |
|
105 |
$1_CODESIGN := true |
|
106 |
endif |
|
107 |
endif |
|
108 |
||
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
109 |
ifeq ($(STATIC_BUILD), true) |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
110 |
$1_LDFLAGS += -Wl,-all_load \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
111 |
$(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs/java.base -name "*.a") \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
112 |
$(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libdt_socket.a \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
113 |
$(SUPPORT_OUTPUTDIR)/modules_libs/jdk.jdwp.agent/libjdwp.a \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
114 |
$(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
115 |
-framework CoreFoundation \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
116 |
-framework Foundation \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
117 |
-framework SystemConfiguration \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
118 |
-framework Cocoa -framework Security \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
119 |
-framework ApplicationServices \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
120 |
-lstdc++ -liconv \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
121 |
-sectcreate __TEXT __info_plist \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
122 |
$(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
123 |
-exported_symbols_list \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
124 |
$(SUPPORT_OUTPUTDIR)/build-static/exported.symbols |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
125 |
else |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
126 |
$1_LDFLAGS += -Wl,-all_load $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a \ |
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
127 |
-sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) |
33661 | 128 |
$1_LIBS += -framework Cocoa -framework Security \ |
129 |
-framework ApplicationServices |
|
33653
c1ee09fe3274
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32515
diff
changeset
|
130 |
endif |
25859 | 131 |
endif |
132 |
||
133 |
ifeq ($(OPENJDK_TARGET_OS), aix) |
|
33406 | 134 |
$1_LDFLAGS += -L$(SUPPORT_OUTPUTDIR)/native/java.base |
135 |
$1_LIBS += -ljli_static |
|
25859 | 136 |
endif |
137 |
||
138 |
ifeq ($(USE_EXTERNAL_LIBZ), true) |
|
33406 | 139 |
$1_LIBS += -lz |
25859 | 140 |
endif |
141 |
||
142 |
$1_OUTPUT_DIR_ARG := $9 |
|
143 |
ifeq (, $$($1_OUTPUT_DIR_ARG)) |
|
27565 | 144 |
$1_OUTPUT_DIR_ARG := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE) |
25859 | 145 |
endif |
146 |
||
147 |
# TODO: maybe it's better to move this if-statement out of this function |
|
148 |
ifeq ($1, java) |
|
149 |
$1_OPTIMIZATION_ARG := HIGH |
|
150 |
$1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR) |
|
151 |
else |
|
33406 | 152 |
$1_OPTIMIZATION_ARG := LOW |
25859 | 153 |
endif |
154 |
||
155 |
$1_CFLAGS := $(CFLAGS_JDKEXE) |
|
156 |
ifeq ($(10), true) |
|
157 |
$1_CFLAGS := $(filter-out -MD, $(CFLAGS_JDKEXE)) |
|
158 |
endif |
|
159 |
||
160 |
# The linker on older SuSE distros (e.g. on SLES 10) complains with: |
|
161 |
# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable." |
|
162 |
# if feeded with a version script which contains named tags. |
|
163 |
ifeq ($(USING_BROKEN_SUSE_LD),yes) |
|
164 |
ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), ) |
|
165 |
$1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous |
|
166 |
else |
|
167 |
$1_MAPFILE := |
|
168 |
endif |
|
169 |
else |
|
170 |
ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), ) |
|
171 |
$1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU) |
|
172 |
else |
|
173 |
$1_MAPFILE := |
|
174 |
endif |
|
175 |
endif |
|
176 |
||
177 |
$(call SetupNativeCompilation,BUILD_LAUNCHER_$1, \ |
|
178 |
SRC := $(LAUNCHER_SRC), \ |
|
179 |
INCLUDE_FILES := main.c, \ |
|
180 |
OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \ |
|
181 |
CFLAGS := $$($1_CFLAGS) \ |
|
182 |
$(LAUNCHER_CFLAGS) \ |
|
183 |
-DFULL_VERSION='"$(FULL_VERSION)"' \ |
|
184 |
-DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ |
|
185 |
-DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ |
|
186 |
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ |
|
187 |
-DPROGNAME='"$1"' $(DPACKAGEPATH) \ |
|
188 |
$2, \ |
|
189 |
CFLAGS_linux := -fPIC, \ |
|
190 |
CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \ |
|
191 |
LDFLAGS := $(LDFLAGS_JDKEXE) \ |
|
192 |
$(ORIGIN_ARG) \ |
|
193 |
$$($1_LDFLAGS), \ |
|
33406 | 194 |
LDFLAGS_linux := \ |
195 |
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)) \ |
|
196 |
-L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ |
|
25859 | 197 |
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \ |
198 |
LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ |
|
33406 | 199 |
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)) \ |
200 |
-L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ |
|
25859 | 201 |
MAPFILE := $$($1_MAPFILE), \ |
33406 | 202 |
LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ |
203 |
LIBS_unix := $4, \ |
|
204 |
LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \ |
|
205 |
LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \ |
|
206 |
LIBS_windows := $$($1_WINDOWS_JLI_LIB) \ |
|
27565 | 207 |
$(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib $5, \ |
208 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$1_objs$(OUTPUT_SUBDIR), \ |
|
25859 | 209 |
OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \ |
210 |
PROGRAM := $1, \ |
|
211 |
DEBUG_SYMBOLS := true, \ |
|
212 |
VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \ |
|
213 |
RC_FLAGS := $(RC_FLAGS) \ |
|
214 |
-D "JDK_FNAME=$1$(EXE_SUFFIX)" \ |
|
215 |
-D "JDK_INTERNAL_NAME=$1" \ |
|
216 |
-D "JDK_FTYPE=0x1L" \ |
|
217 |
$7, \ |
|
218 |
MANIFEST := $(JAVA_MANIFEST), \ |
|
29925
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
27953
diff
changeset
|
219 |
MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ |
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
27953
diff
changeset
|
220 |
CODESIGN := $$($1_CODESIGN), \ |
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
27953
diff
changeset
|
221 |
) |
25859 | 222 |
|
27565 | 223 |
TARGETS += $$(BUILD_LAUNCHER_$1) |
25859 | 224 |
|
225 |
ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix)) |
|
27565 | 226 |
$$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a |
25859 | 227 |
endif |
228 |
||
229 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
27565 | 230 |
$$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \ |
25859 | 231 |
$$($1_WINDOWS_JLI_LIB) |
232 |
endif |
|
233 |
endef |
|
234 |
||
235 |
########################################################################################## |
|
236 |
||
237 |
XLIBS := $(X_LIBS) -lX11 |
|
238 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
239 |
DPACKAGEPATH := -DPACKAGE_PATH='"$(PACKAGE_PATH)"' |
|
240 |
XLIBS := |
|
241 |
endif |
|
242 |
||
243 |
JAVA_RC_FLAGS += -i $(JDK_TOPDIR)/src/java.base/windows/native/common |
|
244 |
ifdef OPENJDK |
|
245 |
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons" |
|
246 |
else |
|
247 |
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons" |
|
248 |
endif |