Skip to content

Commit d580bcf

Browse files
magicusmagicus
committed
8329178: Clean up jdk.accessibility native compilation
Reviewed-by: erikj, prr
1 parent 4fa77a2 commit d580bcf

File tree

2 files changed

+75
-76
lines changed

2 files changed

+75
-76
lines changed

‎make/modules/jdk.accessibility/Launcher.gmk‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,77 +26,76 @@
2626
include LauncherCommon.gmk
2727

2828
ifeq ($(call isTargetOs, windows), true)
29-
3029
ACCESSIBILITY_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
31-
TOOLS_CFLAGS := $(addprefix -I, \
32-
$(ACCESSIBILITY_SRCDIR)/include/bridge \
33-
$(ACCESSIBILITY_SRCDIR)/common \
34-
$(ACCESSIBILITY_SRCDIR)/toolscommon)
3530

3631
##############################################################################
37-
# jabswitch
32+
# Build jabswitch
33+
##############################################################################
3834

3935
$(eval $(call SetupJdkExecutable, BUILD_JABSWITCH, \
4036
NAME := jabswitch, \
41-
SRC := $(ACCESSIBILITY_SRCDIR)/jabswitch, \
42-
INCLUDE_FILES := jabswitch.cpp, \
43-
CFLAGS_FILTER_OUT := -Zc:wchar_t-, \
4437
CXXFLAGS_FILTER_OUT := -Zc:wchar_t-, \
45-
CFLAGS := -Zc:wchar_t -analyze- -Od -Gd -D_WINDOWS -D_UNICODE \
46-
-DUNICODE -RTC1 -EHsc, \
4738
CXXFLAGS := -Zc:wchar_t -analyze- -Od -Gd -D_WINDOWS -D_UNICODE \
4839
-DUNICODE -RTC1 -EHsc, \
4940
DISABLED_WARNINGS_microsoft_jabswitch.cpp := 4267 4996, \
50-
LIBS := advapi32.lib version.lib user32.lib, \
51-
VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
41+
LIBS_windows := advapi32.lib user32.lib version.lib, \
42+
VERSIONINFO_RESOURCE := \
43+
$(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
5244
MANIFEST := $(ACCESSIBILITY_SRCDIR)/jabswitch/jabswitch.manifest, \
5345
MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
5446
))
5547

5648
TARGETS += $(BUILD_JABSWITCH)
5749

5850
##############################################################################
59-
# jaccessinspector
60-
61-
define SetupInspector
51+
# Setup rules to create 32/64 bit version of jaccessinspector
52+
#
6253
# Parameter 1 File name suffix
6354
# Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
64-
55+
##############################################################################
56+
define SetupInspector
6557
$$(eval $$(call SetupJdkExecutable, BUILD_JACCESSINSPECTOR$1, \
66-
NAME := jaccessinspector$1, \
67-
SRC := $(ACCESSIBILITY_SRCDIR)/jaccessinspector $(ACCESSIBILITY_SRCDIR)/common \
68-
$(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \
69-
CFLAGS := $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
70-
CXXFLAGS := $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
71-
LDFLAGS := -stack:655360, \
72-
LIBS := advapi32.lib user32.lib, \
73-
VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
58+
NAME := jaccessinspector$1, \
59+
SRC := jaccessinspector, \
60+
EXTRA_SRC := \
61+
bridge \
62+
common \
63+
toolscommon, \
64+
EXTRA_HEADER_DIRS := include/bridge, \
65+
CFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
66+
CXXFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
67+
LDFLAGS_windows := -stack:655360, \
68+
LIBS_windows := advapi32.lib user32.lib, \
69+
VERSIONINFO_RESOURCE := \
70+
$(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
7471
))
7572

7673
TARGETS += $$(BUILD_JACCESSINSPECTOR$1)
77-
7874
endef
7975

8076
##############################################################################
81-
# jaccesswalker
82-
83-
define SetupWalker
77+
# Setup rules to create 32/64 bit version of jaccesswalker
8478
# Parameter 1 File name suffix
8579
# Parameter 2 ACCESSBRIDGE_ARCH_ -D suffix
86-
80+
##############################################################################
81+
define SetupWalker
8782
$$(eval $$(call SetupJdkExecutable, BUILD_JACCESSWALKER$1, \
88-
NAME := jaccesswalker$1, \
89-
SRC := $(ACCESSIBILITY_SRCDIR)/jaccesswalker $(ACCESSIBILITY_SRCDIR)/common \
90-
$(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \
91-
CFLAGS := $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
92-
CXXFLAGS := $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
93-
LDFLAGS := -stack:655360, \
94-
LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
95-
VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
83+
NAME := jaccesswalker$1, \
84+
SRC := jaccesswalker, \
85+
EXTRA_SRC := \
86+
bridge \
87+
common \
88+
toolscommon, \
89+
EXTRA_HEADER_DIRS := include/bridge, \
90+
CFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
91+
CXXFLAGS := -DACCESSBRIDGE_ARCH_$2 -EHsc, \
92+
LDFLAGS_windows := -stack:655360, \
93+
LIBS_windows := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
94+
VERSIONINFO_RESOURCE := \
95+
$(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
9696
))
9797

9898
TARGETS += $$(BUILD_JACCESSWALKER$1)
99-
10099
endef
101100

102101
ifeq ($(call isTargetCpuBits, 32), true)
@@ -108,7 +107,4 @@ ifeq ($(call isTargetOs, windows), true)
108107
$(eval $(call SetupInspector,,64))
109108
$(eval $(call SetupWalker,,64))
110109
endif
111-
112110
endif
113-
114-
################################################################################

‎make/modules/jdk.accessibility/Lib.gmk‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,77 +28,83 @@ include LibCommon.gmk
2828
################################################################################
2929

3030
ifeq ($(call isTargetOs, windows), true)
31-
3231
ACCESSIBILITY_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
3332

33+
##############################################################################
34+
# Setup rules to create 32/64 bit version of javaaccessbridge
35+
#
36+
# Parameter 1 Suffix
37+
# Parameter 2 ACCESSBRIDGE_ARCH_ suffix
38+
##############################################################################
3439
define SetupJavaDLL
35-
# Parameter 1 Suffix
36-
# Parameter 2 ACCESSBRIDGE_ARCH_ suffix
37-
38-
$(call SetupJdkLibrary, BUILD_JAVAACCESSBRIDGE$1, \
40+
$(call SetupJdkLibrary, BUILD_LIBJAVAACCESSBRIDGE$1, \
3941
NAME := javaaccessbridge$1, \
4042
SRC := libjavaaccessbridge, \
4143
EXTRA_SRC := common, \
4244
OPTIMIZATION := LOW, \
4345
DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
44-
CFLAGS_FILTER_OUT := -MD, \
4546
CXXFLAGS_FILTER_OUT := -MD, \
46-
CFLAGS := -MT -DACCESSBRIDGE_ARCH_$2, \
4747
CXXFLAGS := -MT -DACCESSBRIDGE_ARCH_$2, \
4848
EXTRA_HEADER_DIRS := \
4949
include/bridge \
5050
java.desktop:include, \
51-
LIBS := kernel32.lib user32.lib gdi32.lib \
52-
winspool.lib comdlg32.lib advapi32.lib shell32.lib \
53-
$(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib \
54-
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
55-
VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
51+
JDK_LIBS_windows := $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib, \
52+
LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
53+
odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
54+
user32.lib uuid.lib winspool.lib, \
55+
VERSIONINFO_RESOURCE := \
56+
$(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
5657
)
5758

58-
$$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt)
59+
$$(BUILD_LIBJAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt)
5960

60-
TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1)
61+
TARGETS += $$(BUILD_LIBJAVAACCESSBRIDGE$1)
6162
endef
6263

64+
##############################################################################
65+
# Setup rules to create 32/64 bit version of windowsaccessbridge
66+
#
67+
# Parameter 1 Suffix
68+
# Parameter 2 ACCESSBRIDGE_ARCH_ suffix
69+
##############################################################################
6370
define SetupWinDLL
64-
# Parameter 1 Suffix
65-
# Parameter 2 ACCESSBRIDGE_ARCH_ suffix
66-
$(call SetupJdkLibrary, BUILD_WINDOWSACCESSBRIDGE$1, \
71+
$(call SetupJdkLibrary, BUILD_LIBWINDOWSACCESSBRIDGE$1, \
6772
NAME := windowsaccessbridge$1, \
6873
SRC := libwindowsaccessbridge, \
6974
EXTRA_SRC := common, \
7075
OPTIMIZATION := LOW, \
7176
DISABLED_WARNINGS_microsoft_WinAccessBridge.cpp := 4302 4311, \
72-
CFLAGS := -DACCESSBRIDGE_ARCH_$2, \
7377
CXXFLAGS := -DACCESSBRIDGE_ARCH_$2, \
7478
EXTRA_HEADER_DIRS := \
7579
include/bridge, \
7680
LDFLAGS := \
7781
-def:$(ACCESSIBILITY_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
78-
LIBS := kernel32.lib user32.lib gdi32.lib \
79-
winspool.lib comdlg32.lib advapi32.lib shell32.lib \
80-
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib, \
81-
VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
82+
LIBS_windows := advapi32.lib comdlg32.lib gdi32.lib kernel32.lib \
83+
odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib \
84+
user32.lib uuid.lib winspool.lib, \
85+
VERSIONINFO_RESOURCE := \
86+
$(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
8287
)
8388

84-
TARGETS += $$(BUILD_WINDOWSACCESSBRIDGE$1)
85-
89+
TARGETS += $$(BUILD_LIBWINDOWSACCESSBRIDGE$1)
8690
endef
8791

88-
define SetupAccessBridgeSysInfo
92+
ifeq ($(call isTargetCpuBits, 32), true)
93+
############################################################################
94+
# Build libjabsysinfo
95+
############################################################################
8996

90-
$(call SetupJdkLibrary, BUILD_ACCESSBRIDGESYSINFO, \
97+
$(eval $(call SetupJdkLibrary, BUILD_LIBJABSYSINFO, \
9198
NAME := jabsysinfo, \
9299
OPTIMIZATION := LOW, \
93-
VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
100+
VERSIONINFO_RESOURCE := \
101+
$(ACCESSIBILITY_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
94102
)
95103

96-
TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
97-
98-
endef
104+
TARGETS += $(BUILD_LIBJABSYSINFO)
105+
endif
99106

100107
ifeq ($(call isTargetCpuBits, 32), true)
101-
$(eval $(call SetupAccessBridgeSysInfo))
102108
$(eval $(call SetupJavaDLL,-32,32))
103109
$(eval $(call SetupJavaDLL,,LEGACY))
104110
$(eval $(call SetupWinDLL,-32,32))
@@ -107,7 +113,4 @@ ifeq ($(call isTargetOs, windows), true)
107113
$(eval $(call SetupJavaDLL,,64))
108114
$(eval $(call SetupWinDLL,-64,64))
109115
endif
110-
111116
endif
112-
113-
################################################################################

0 commit comments

Comments
 (0)