Skip to content

Commit 0ee64d8

Browse files
keithc-caGitHub Enterprise
keithc-ca
authored and
GitHub Enterprise
committed
Merge pull request ibmruntimes#129 from vsebe/openj9-jdk-zos.jaas
Integrate CMPSAF, CMPIBMPKCS, CMPJAAS components
2 parents b881861 + 2128927 commit 0ee64d8

8 files changed

+215
-0
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
/.build
2626
# exclude all source directories
2727
/closedj9
28+
/CMPIBMPKCS
29+
/CMPJAAS
30+
/CMPSAF
2831
/omr
2932
/openj9
3033
/openssl

‎closed/Components.gmk

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# ===========================================================================
2+
# (c) Copyright IBM Corp. 2020, 2020 All Rights Reserved
3+
# ===========================================================================
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation.
7+
#
8+
# IBM designates this particular file as subject to the "Classpath" exception
9+
# as provided by IBM 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, see <http://www.gnu.org/licenses/>.
19+
# ===========================================================================
20+
21+
no_default :
22+
$(error Components.gmk has no default target)
23+
24+
include $(SPEC)
25+
include $(TOPDIR)/closed/custom/common/ComponentsCommon.gmk
26+
include $(TOPDIR)/make/common/MakeBase.gmk
27+
28+
CMP_TARGETS = \
29+
$(foreach module, $(CMP_MODULES), $(addprefix $(module),-stage -libs -copy -clean))
30+
31+
.PHONY : no_default stage-components $(CMP_TARGETS)
32+
33+
# copy_component_tree
34+
# -------------------
35+
# Copy recursively source $2 to target directory $1.
36+
# pax returns an exit code >0 when $1/. is newer, ignore this.
37+
# $1 = target directory
38+
# $2 = source directory
39+
define copy_component_tree
40+
$(if $(filter 1,$(words $2)),,$(error copy_component_tree requires exactly one source directory; got '$2'))
41+
@$(MKDIR) -p $1
42+
@$(CD) $2 ; $(PAX) -rwuC . $1 2>/dev/null || true
43+
endef
44+
45+
# stage_module_rule
46+
# -----------------
47+
# Copy java classes to $(SUPPORT_OUTPUTDIR)/j9jcl_sources/$1/share/classes.
48+
# $1 = module name
49+
define stage_module_rule
50+
stage-components : $1-stage
51+
$1-stage :
52+
$(call copy_component_tree,$(patsubst %,$(SUPPORT_OUTPUTDIR)/j9jcl_sources/%/share/classes,$1),$(wildcard $(TOPDIR)/*/src/$1))
53+
endef
54+
55+
# Targets to stage java source
56+
$(foreach module, $(CMP_MODULES), \
57+
$(eval $(call stage_module_rule,$(module))) \
58+
)
59+
60+
ibm.os390.security_target := libSecurityServices.so
61+
ibm.security.auth_target := all_$(OPENJDK_BUILD_CPU_BITS)
62+
63+
# generate_lib_target
64+
# -------------------
65+
# $1 = module name
66+
# HEADERS_DIR should end with a slash
67+
define generate_lib_target
68+
$1-libs :
69+
@$(ECHO) Compiling $1 native
70+
$(MAKE) -C $(call find_native_src_dir,$1) \
71+
JAVA_HOME=$(BOOT_JDK) \
72+
HEADERS_DIR=$(SUPPORT_OUTPUTDIR)/headers/$1/ \
73+
$$($1_target)
74+
endef
75+
76+
# Targets to compile native code
77+
$(foreach module, $(CMP_MODULES), \
78+
$(eval $(call generate_lib_target,$(module))))
79+
80+
# generate_clean_target
81+
# ---------------------
82+
# $1 = module name
83+
define generate_clean_target
84+
$1-clean :
85+
$(MAKE) -C $(call find_native_src_dir,$1) clean
86+
endef
87+
88+
# Targets to clean natives
89+
$(foreach module, $(CMP_MODULES), \
90+
$(eval $(call generate_clean_target,$(module))))
91+
92+
# add_component_natives_libs
93+
# --------------------------
94+
# Copy native lib to $(SUPPORT_OUTPUTDIR)/modules_libs/$1 directory.
95+
# $1 = module name
96+
# $2 = file to copy
97+
define add_component_natives_libs
98+
$1-copy : $(call FindLibDirForModule,$1)/$(notdir $2)
99+
$(call FindLibDirForModule,$1)/$(notdir $2) : $2
100+
$$(call install-file)
101+
endef
102+
103+
# Targets to copy native libs
104+
$(foreach module, $(CMP_MODULES), \
105+
$(foreach file, \
106+
$(wildcard $(call find_native_src_dir,$(module))/*$(SHARED_LIBRARY_SUFFIX)), \
107+
$(eval $(call add_component_natives_libs,$(module),$(file)))))

‎closed/autoconf/custom-hook.m4

+4
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ AC_DEFUN([OPENJ9_CONFIGURE_CMAKE],
9696
AC_DEFUN([OPENJ9_BASIC_SETUP_FUNDAMENTAL_TOOLS],
9797
[
9898
BASIC_REQUIRE_PROGS(M4, m4)
99+
100+
if test "x$OPENJDK_TARGET_OS" = xzos ; then
101+
BASIC_REQUIRE_PROGS(PAX, pax)
102+
fi
99103
])
100104

101105
AC_DEFUN([OPENJ9_CONFIGURE_WARNINGS],

‎closed/autoconf/custom-spec.gmk.in

+2
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,5 @@ ifeq (riscv64,$(OPENJDK_TARGET_CPU))
149149
JAVA_FLAGS += -DserverStartupTimeout=36000
150150
endif
151151
endif
152+
153+
PAX := @PAX@

‎closed/custom/Main-post.gmk

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# ===========================================================================
2+
# (c) Copyright IBM Corp. 2020, 2020 All Rights Reserved
3+
# ===========================================================================
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation.
7+
#
8+
# IBM designates this particular file as subject to the "Classpath" exception
9+
# as provided by IBM 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, see <http://www.gnu.org/licenses/>.
19+
# ============================================================================
20+
21+
.PHONY : stage-zos-components
22+
23+
COMPONENTS_MAKE := $(MAKE) -f $(TOPDIR)/closed/Components.gmk SPEC=$(SPEC)
24+
25+
openj9-create-main-targets-include : stage-zos-components
26+
27+
stage-zos-components :
28+
@$(ECHO) Staging z/OS components $(COMPONENTS)
29+
@$(COMPONENTS_MAKE) stage-components
30+
31+
# Targets for z/OS specific modules native compilation
32+
33+
define DeclareCompileCmpNativeRecipe
34+
$1-libs : $1-java
35+
+$(COMPONENTS_MAKE) $1-libs
36+
$1-copy : $1-libs
37+
+$(COMPONENTS_MAKE) $1-copy
38+
$1-clean :
39+
+$(COMPONENTS_MAKE) $1-clean
40+
clean-$1 : $1-clean
41+
endef
42+
43+
$(foreach module, $(CMP_LIBS_MODULES), \
44+
$(eval $(call DeclareCompileCmpNativeRecipe,$(module))))
45+
46+
CMP_LIBS_TARGETS := $(addsuffix -libs, $(CMP_LIBS_MODULES))
47+
CMP_COPY_TARGETS := $(addsuffix -copy, $(CMP_LIBS_MODULES))
48+
ALL_TARGETS += $(CMP_LIBS_TARGETS) $(CMP_COPY_TARGETS)
49+
50+
$(foreach module, $(CMP_LIBS_MODULES), $(eval $(module)_JMOD_DEPS += $(module)-copy))

‎closed/custom/common/ComponentsCommon.gmk

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# ===========================================================================
2+
# (c) Copyright IBM Corp. 2020, 2020 All Rights Reserved
3+
# ===========================================================================
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation.
7+
#
8+
# IBM designates this particular file as subject to the "Classpath" exception
9+
# as provided by IBM 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, see <http://www.gnu.org/licenses/>.
19+
# ===========================================================================
20+
21+
COMPONENTS :=
22+
23+
ifeq ($(OPENJDK_TARGET_OS), zos)
24+
COMPONENTS += \
25+
$(notdir $(wildcard $(addprefix $(TOPDIR)/,CMPIBMPKCS CMPJAAS CMPSAF)))
26+
endif
27+
28+
CMP_MODULES := \
29+
$(foreach component, $(COMPONENTS), \
30+
$(notdir $(patsubst %/, %, \
31+
$(dir $(wildcard $(TOPDIR)/$(component)/src/*/module-info.java)))))
32+
33+
PLATFORM_MODULES += $(CMP_MODULES)
34+
35+
# find_native_src_dir
36+
# -------------------
37+
# Find native source for a module.
38+
# $1 = module name
39+
find_native_src_dir = \
40+
$(wildcard $(addsuffix build/mvs/$(OPENJDK_BUILD_CPU_BITS)-bit, \
41+
$(patsubst %/src/$1, %/, $(wildcard $(TOPDIR)/*/src/$1))))
42+
43+
CMP_LIBS_MODULES := \
44+
$(foreach module, $(CMP_MODULES), \
45+
$(if $(call find_native_src_dir,$(module)),$(module)))

‎closed/custom/common/Modules.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
1919
# ===========================================================================
2020

21+
include $(TOPDIR)/closed/custom/common/ComponentsCommon.gmk
22+
2123
BOOT_MODULES += \
2224
openj9.jvm \
2325
openj9.sharedclasses \

‎closed/custom/common/SetupJavaCompilers.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
# OpenJ9 requires more lenient javac warnings for these modules.
2222
WARNING_MODULES := \
23+
ibm.security.auth \
24+
ibm.security.pkcs \
2325
java.base \
2426
jdk.management \
2527
openj9.dataaccess \

0 commit comments

Comments
 (0)