Skip to content

Improve names of .node files #768

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

Open
Bashamega wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Improve names of .node files #768

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c9191b8
Rename conpty.cc to conpty_backend.cc
Bashamega Mar 14, 2025
14219fd
Rename winpty.cc to winpty_backend.cc
Bashamega Mar 14, 2025
6a5f6cd
patch:file name
Bashamega Mar 14, 2025
0b03874
Update binding.gyp
Bashamega Mar 14, 2025
8e7be77
Update binding.gyp
Bashamega Mar 14, 2025
92e4bb1
Update windowsPtyAgent.ts
Bashamega Mar 14, 2025
07e161b
chore: revert file name change
Bashamega Mar 15, 2025
d252340
chore: fix post install
Bashamega Mar 15, 2025
c42caca
-
Bashamega Mar 15, 2025
5402d97
-
Bashamega Mar 15, 2025
503b113
Update post-install.js
Bashamega Mar 17, 2025
407dc48
Merge branch 'main' into Bashamega-patch-1
Bashamega Mar 17, 2025
519a8ae
Update conpty.cc
Bashamega Mar 18, 2025
41b5881
Merge branch 'main' into Bashamega-patch-1
Bashamega Mar 18, 2025
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
4 changes: 2 additions & 2 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
'target_name': 'conpty',
'sources' : [
'src/win/conpty.cc',
'src/win/conpty_backend.cc',
Copy link
Member

@Tyriar Tyriar Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it target_name we need to change as well to change the .node file, then an update here is needed too:

node-pty/src/windowsPtyAgent.ts

Lines 64 to 93 in 467cea0

if (!conptyNative) {
try {
conptyNative = require('../build/Release/conpty.node');
} catch (outerError) {
try {
conptyNative = require('../build/Debug/conpty.node');
} catch (innerError) {
console.error('innerError', innerError);
// Re-throw the exception from the Release require if the Debug require fails as well
throw outerError;
}
}
}
} else {
if (!winptyNative) {
try {
winptyNative = require('../build/Release/pty.node');
} catch (outerError) {
try {
winptyNative = require('../build/Debug/pty.node');
} catch (innerError) {
console.error('innerError', innerError);
// Re-throw the exception from the Release require if the Debug require fails as well
throw outerError;
}
}
}
}
this._ptyNative = this._useConpty ? conptyNative : winptyNative;

Copy link
Author

@Bashamega Bashamega Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. I will update it

Copy link
Author

@Bashamega Bashamega Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done :)

Copy link
Member

@Tyriar Tyriar Mar 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We just need to figure out why CI is failing now. See the error at https://dev.azure.com/vscode/node-pty/_build/results?buildId=147363&view=logs&j=0bc77094-9fcd-5c38-f6e4-27d2ae131589&t=2917e7a9-bb9d-585b-890e-1ad69b6f3f65&l=976

Copy link
Contributor

@deepak1556 deepak1556 Mar 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name should be updated in

node-pty/scripts/post-install.js

Lines 10 to 11 in 090384f

path.join(RELEASE_DIR, 'conpty.node'),
path.join(RELEASE_DIR, 'conpty.pdb'),
to fix the build error.

Copy link
Author

@Bashamega Bashamega Mar 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

Copy link
Author

@Bashamega Bashamega Mar 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @deepak1556
I have updated the post-install script, but it is still not working.

Copy link
Contributor

@deepak1556 deepak1556 Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check #768 (comment)

Copy link
Contributor

@deepak1556 deepak1556 Mar 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changing the target name is sufficient to achieve the required result, lets keep the source file names unchanged.

Copy link
Author

@Bashamega Bashamega Mar 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay

'src/win/path_util.cc'
],
'libraries': [
Expand All @@ -58,7 +58,7 @@
'deps/winpty/src/winpty.gyp:winpty',
],
'sources' : [
'src/win/winpty.cc',
'src/win/winpty_backend.cc',
Copy link
Contributor

@deepak1556 deepak1556 Mar 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required for the scope of this PR, lets revert this.

'src/win/path_util.cc'
],
'libraries': [
Expand Down
0 src/win/conpty.cc → src/win/conpty_backend.cc
View file
Open in desktop
File renamed without changes.
0 src/win/winpty.cc → src/win/winpty_backend.cc
View file
Open in desktop
File renamed without changes.
Loading