Skip to content
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

Jump to bottom

zos: rebase and apply custom compile flags to support Node v12 and v14 #1

Merged
merged 12 commits into from
Jul 10, 2020
Merged

zos: rebase and apply custom compile flags to support Node v12 and v14 #1

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
1ba14d2
v0.12.0
joeferner Nov 18, 2019
9ecc5a4
updated source files to compile on electron 7
gnudles Jan 8, 2020
bca3c7a
v0.12.1
joeferner Jan 23, 2020
d0e64ce
Bump handlebars from 4.1.2 to 4.5.3
dependabot[bot] Dec 29, 2019
ccd2b67
Fix clobbering of dynamicProxyData with concurrent proxy calls.
jkstrick Feb 23, 2017
bc557ad
Use libuv async facility to queue javascript calls, instead of the af…
jkstrick Apr 7, 2017
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
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
27 changes: 23 additions & 4 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@
['OS=="mac"', {
'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,9 +104,25 @@
]
}
],
["OS=='zos'", {
"cflags!": [ "-O2", "-O3" ]
}],
['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
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"jvm",
"bridge"
],
"version": "0.11.1",
"version": "0.12.1",
"engines": {
"node": ">=7.0.0"
},
Expand Down
Loading