Skip to content

Commit

Permalink
Merge pull request #587 from microsoft/robo/cleanup_posix_spawn
Browse files Browse the repository at this point in the history
refactor: posix_spawn usage for macOS
  • Loading branch information
Tyriar committed Mar 27, 2023
2 parents 92ea92e + 0507164 commit fdbeaa1
Show file tree
Hide file tree
Showing 10 changed files with 400 additions and 334 deletions.
15 changes: 0 additions & 15 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,6 @@
]
}, { # OS!="win"
'targets': [
{
'target_name': 'spawn-helper',
'type': 'executable',
'cflags': ['-Wall'],
'sources': [
'src/unix/spawn-helper.cc',
],
'conditions': [
['OS=="mac"', {
"xcode_settings": {
"MACOSX_DEPLOYMENT_TARGET":"10.7"
}
}]
]
},
{
'target_name': 'pty',
'include_dirs' : [
Expand Down
1 change: 0 additions & 1 deletion scripts/post-install.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var BUILD_FILES = [
path.join(RELEASE_DIR, 'conpty_console_list.pdb'),
path.join(RELEASE_DIR, 'pty.node'),
path.join(RELEASE_DIR, 'pty.pdb'),
path.join(RELEASE_DIR, 'spawn-helper'),
path.join(RELEASE_DIR, 'winpty-agent.exe'),
path.join(RELEASE_DIR, 'winpty-agent.pdb'),
path.join(RELEASE_DIR, 'winpty.dll'),
Expand Down
1 change: 0 additions & 1 deletion src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ interface IBasePtyForkOptions {
export interface IPtyForkOptions extends IBasePtyForkOptions {
uid?: number;
gid?: number;
closeFDs?: boolean;
}

export interface IWindowsPtyForkOptions extends IBasePtyForkOptions {
Expand Down
2 changes: 1 addition & 1 deletion src/native.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface IWinptyNative {
}

interface IUnixNative {
fork(file: string, args: string[], parsedEnv: string[], cwd: string, cols: number, rows: number, uid: number, gid: number, closeFDs: boolean, useUtf8: boolean, onExitCallback: (code: number, signal: number) => void, helperPath: string): IUnixProcess;
fork(file: string, args: string[], parsedEnv: string[], cwd: string, cols: number, rows: number, uid: number, gid: number, useUtf8: boolean, onExitCallback: (code: number, signal: number) => void): IUnixProcess;
open(cols: number, rows: number): IUnixOpenProcess;
process(fd: number, pty: string): string;
resize(fd: number, cols: number, rows: number): void;
Expand Down
5 changes: 0 additions & 5 deletions src/unix/comms.h

This file was deleted.

Loading

0 comments on commit fdbeaa1

Please sign in to comment.