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

Port to NAPI #644

Merged
merged 10 commits into from
Jan 26, 2024
Merged

Port to NAPI #644

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5dbe674
Port to NAPI
kkocdko Dec 5, 2023
e5028c0
Fix help message in pty.cc
kkocdko Dec 6, 2023
c682e8e
Move NAPI deps to devDependencies in package.json
kkocdko Dec 6, 2023
67142f9
Apply most of deepak1556's suggestions
kkocdko Jan 24, 2024
64478d6
Fix winpty
kkocdko Jan 24, 2024
02e27b4
Fix conpty missing CloseHandle
kkocdko Jan 24, 2024
5bc82dd
Use unique_ptr to avoid `goto`s
kkocdko Jan 24, 2024
bf4ac88
Why macos failed?
kkocdko Jan 24, 2024
27254dd
fix: ci and minor cleanups
deepak1556 Jan 26, 2024
8dfeacd
fix build failed on windows
kkocdko Jan 26, 2024
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
48 changes: 44 additions & 4 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,17 @@
'targets': [
{
'target_name': 'conpty',
'cflags!': [ '-fno-exceptions' ],
kkocdko marked this conversation as resolved.
Show resolved Hide resolved
'cflags_cc!': [ '-fno-exceptions' ],
'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'CLANG_CXX_LIBRARY': 'libc++',
'MACOSX_DEPLOYMENT_TARGET': '10.7',
},
'msvs_settings': {
'VCCLCompilerTool': { 'ExceptionHandling': 1 },
},
'include_dirs' : [
'<!(node -e "require(\'nan\')")'
'<!(node -p "require(\'node-addon-api\').include_dir")'
],
'sources' : [
'src/win/conpty.cc',
Expand All @@ -41,17 +50,35 @@
},
{
'target_name': 'conpty_console_list',
'cflags!': [ '-fno-exceptions' ],
'cflags_cc!': [ '-fno-exceptions' ],
'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'CLANG_CXX_LIBRARY': 'libc++',
'MACOSX_DEPLOYMENT_TARGET': '10.7',
},
'msvs_settings': {
'VCCLCompilerTool': { 'ExceptionHandling': 1 },
},
'include_dirs' : [
'<!(node -e "require(\'nan\')")'
'<!(node -p "require(\'node-addon-api\').include_dir")'
],
'sources' : [
'src/win/conpty_console_list.cc'
],
},
{
'target_name': 'pty',
'cflags!': [ '-fno-exceptions' ],
'cflags_cc!': [ '-fno-exceptions' ],
'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'CLANG_CXX_LIBRARY': 'libc++',
'MACOSX_DEPLOYMENT_TARGET': '10.7',
},
'msvs_settings': {
'VCCLCompilerTool': { 'ExceptionHandling': 1 },
},
'include_dirs' : [
'<!(node -e "require(\'nan\')")',
'<!(node -p "require(\'node-addon-api\').include_dir")',
'deps/winpty/src/include',
],
# Disabled due to winpty
Expand All @@ -73,8 +100,17 @@
'targets': [
{
'target_name': 'pty',
'cflags!': [ '-fno-exceptions' ],
'cflags_cc!': [ '-fno-exceptions' ],
'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'CLANG_CXX_LIBRARY': 'libc++',
'MACOSX_DEPLOYMENT_TARGET': '10.7',
},
'msvs_settings': {
'VCCLCompilerTool': { 'ExceptionHandling': 1 },
},
'include_dirs' : [
'<!(node -e "require(\'nan\')")'
'<!(node -p "require(\'node-addon-api\').include_dir")'
],
'sources': [
'src/unix/pty.cc',
Expand All @@ -93,7 +129,9 @@
]
}],
['OS=="mac"', {
"cflags+": ["-fvisibility=hidden"],
"xcode_settings": {
"GCC_SYMBOLS_PRIVATE_EXTERN": "YES", # -fvisibility=hidden
"MACOSX_DEPLOYMENT_TARGET":"10.7"
}
}]
Expand All @@ -109,7 +147,9 @@
'sources': [
'src/unix/spawn-helper.cc',
],
"cflags+": ["-fvisibility=hidden"],
"xcode_settings": {
"GCC_SYMBOLS_PRIVATE_EXTERN": "YES",
"MACOSX_DEPLOYMENT_TARGET":"10.7"
}
},
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"prepublishOnly": "npm run build"
},
"dependencies": {
"nan": "^2.17.0"
},
"devDependencies": {
"@types/mocha": "^7.0.2",
Expand All @@ -54,6 +53,8 @@
"eslint": "^6.8.0",
"mocha": "10",
"node-gyp": "^9.4.0",
"node-addon-api": "^7.0.0",
kkocdko marked this conversation as resolved.
Show resolved Hide resolved
"node-api-headers": "^1.1.0",
kkocdko marked this conversation as resolved.
Show resolved Hide resolved
"ps-list": "^6.0.0",
"typescript": "^3.8.3"
}
Expand Down
Loading