Skip to content

add support for z/OS #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gabylb wants to merge 12 commits into from
Closed

add support for z/OS #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e941900
include zos when setting javahome
gabylb Nov 18, 2019
11d557d
remove O2 and O3 opts due to compile issue causing intermittent failure
gabylb Nov 21, 2019
bd46bc9
include zos when setting javahome
gabylb Nov 18, 2019
a965691
remove O2 and O3 opts due to compile issue causing intermittent failure
gabylb Nov 21, 2019
647ace1
replace GetContents() by GetBackingStore()
gabylb Jun 26, 2020
6c17279
zos: set compiler flags based on compiler and node versions
gabylb Jun 26, 2020
457e708
Merge branch 'node14-zos' into v8-node14-zos
gabylb Jun 27, 2020
d6ec935
link to libjvm.x on z/OS
gabylb Jul 9, 2020
b5d8614
Merge pull request #1 from ibmruntimes/v8-node14-zos
gabylb Jul 10, 2020
34bb02c
src: verify pointer before calling its method
gabylb Sep 30, 2020
6d38b70
Merge pull request #2 from ibmruntimes/destfix
gabylb Oct 1, 2020
7ecb4d1
Merge branch 'master' into node14-zos
gabylb Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@
['OS=="win"', {
'javahome%': '<!(node findJavaHome.js)'
}],
['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"' , {
['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"' , {
'javahome%': '<!(node findJavaHome.js)'
}],
['OS=="mac"', {
'javaver%' : "<!(awk -F/ -v h=`node findJavaHome.js` 'BEGIN {n=split(h, a); print a[2]; exit}')"
'javaver%' : "<!(awk -F/ -v h=`node findJavaHome.js` 'BEGIN {n=split(h, a); print a[2]; exit}')"
}],
['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
'javalibdir%': "<!(./find_java_libdir.sh <(target_arch) <(OS))"
}],
['OS=="zos"', {
'nodever%': '<!(node -e "console.log(process.versions.node)" | cut -d"." -f1)'
}],
]
},
'targets': [
Expand Down Expand Up @@ -101,6 +104,25 @@
]
}
],
['OS=="zos"',
{
'conditions': [
['nodever<14',
{
'cflags!': [ "-O2", "-O3" ]
}
],
['nodever<12',
{
'cflags': [ "-U_VARARG_EXT_" ],
}
]
],
'libraries': [
'<(javalibdir)/libjvm.x'
]
}
],
['OS=="mac"',
{
'xcode_settings': {
Expand Down
4 changes: 3 additions & 1 deletion find_java_libdir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ main () {
fi

local jre_dir
if [[ "${java_version}" =~ (6|7|8) ]]; then
if [[ "${java_version}" =~ (6|7|8) && "${os}" != "zos" ]]; then
jre_dir="${java_home}/jre/lib"
else
jre_dir="${java_home}/lib"
Expand All @@ -43,6 +43,8 @@ main () {
if [[ -d ${jre_dir}/amd64/classic ]]; then lib_dir="${jre_dir}"/amd64/classic; else lib_dir="${jre_dir}"/amd64/server; fi
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "s390x" || "${target_arch}" == "s390" ]]; then
if [[ -d ${jre_dir}/s390x/classic ]]; then lib_dir="${jre_dir}"/s390x/classic; else lib_dir="${jre_dir}"/s390/classic; fi
elif [[ "${os}" == "zos" ]]; then
lib_dir="${jre_dir}"/s390x/classic
elif [[ "${os}" == "linux" ]] && [[ "${target_arch}" == "ppc64" || "${target_arch}" == "ppc" ]]; then
target_arch=`uname -m`
if [[ -d ${jre_dir}/${target_arch}/classic ]]; then lib_dir="${jre_dir}"/${target_arch}/classic; else lib_dir="${jre_dir}"/${target_arch}/server; fi
Expand Down
5 changes: 4 additions & 1 deletion src/methodCallBaton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,5 +236,8 @@ InstanceMethodCallBaton::InstanceMethodCallBaton(
}

InstanceMethodCallBaton::~InstanceMethodCallBaton() {
m_javaObject->Unref();
if (m_javaObject) {
m_javaObject->Unref();
m_javaObject = NULL;
}
}