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

tools: sync gyp code base with node-gyp repo #30563

Closed
wants to merge 1 commit into from
Closed

tools: sync gyp code base with node-gyp repo #30563

wants to merge 1 commit into from

Conversation

targos
Copy link
Member

@targos targos commented Nov 20, 2019

This syncs the gyp code base so that it is identical to the one in nodejs/node-gyp.

This was done by removing the code in nodejs/node-gyp, copying from nodejs/node and then manually reviewing and adapting the diff.

@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. tools Issues and PRs related to the tools directory. labels Nov 20, 2019
@targos targos mentioned this pull request Nov 20, 2019
Merged
@targos
Copy link
Member Author

targos commented Nov 20, 2019

PR in nodejs/node-gyp: nodejs/node-gyp#1975

@targos targos requested a review from cclauss November 20, 2019 19:07
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26876/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/26878/

ryzokuken
ryzokuken approved these changes Nov 26, 2019
View reviewed changes
Copy link
Contributor

@ryzokuken ryzokuken left a comment

Choose a reason for hiding this comment

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

Hopefully I've seen everything, just a bunch of comments. Likely all the issues need to be picked up in the gyp3 repo instead, so feel free to ignore 'em and merge. Thanks for doing this!

tools/gyp/pylib/gyp/MSVSVersion.py Show resolved Hide resolved
tools/gyp/pylib/gyp/common.py Outdated Show resolved Hide resolved
tools/gyp/gyp_main.py Show resolved Hide resolved
tools/gyp/pylib/gyp/common.py Show resolved Hide resolved
tools/gyp/gyp_main.py Show resolved Hide resolved
tools/gyp/pylib/gyp/input.py Outdated Show resolved Hide resolved
@cclauss
Copy link
Contributor

cclauss commented Nov 27, 2019

Do we really want to get rid of tools/gyp/gyptest.py? Perhaps it should be renamed to tools/gyp/test_gyp.py so that pytest will discover it and modify it to run in our test cycles.

@targos
Copy link
Member Author

targos commented Nov 27, 2019

@cclauss, that file was removed in nodejs/node-gyp#1458

@targos targos mentioned this pull request Dec 1, 2019
Closed
2 tasks
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27266/

BridgeAR
BridgeAR approved these changes Dec 24, 2019
View reviewed changes
Copy link
Member

@BridgeAR BridgeAR left a comment

Choose a reason for hiding this comment

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

RSLGTM

@BridgeAR BridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Dec 24, 2019
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/27918/

@ryzokuken
Copy link
Contributor

@targos what's left to be addressed here?

@targos targos added the blocked PRs that are blocked by other issues or PRs. label Dec 25, 2019
@targos
Copy link
Member Author

targos commented Dec 25, 2019

@ryzokuken nodejs/node-gyp#1975 (comment) and nodejs/node-gyp#1975 (review)

Trott
Trott approved these changes Dec 31, 2019
View reviewed changes
Copy link
Member

@Trott Trott left a comment

Choose a reason for hiding this comment

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

LGTM once unblocked

@Trott Trott removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Jan 4, 2020
@richardlau richardlau mentioned this pull request Jan 29, 2020
Closed
4 tasks
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/28776/

@richardlau richardlau mentioned this pull request Feb 10, 2020
Closed
@rvagg rvagg mentioned this pull request Feb 11, 2020
Closed
@targos targos removed the blocked PRs that are blocked by other issues or PRs. label Feb 19, 2020
@targos
Copy link
Member Author

targos commented Feb 19, 2020

Other PR landed on node-gyp. This should be ready to go.

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/29233/

targos added a commit that referenced this pull request Feb 21, 2020
@targos
tools: sync gyp code base with node-gyp repo
cf00961 
PR-URL: #30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@targos
Copy link
Member Author

targos commented Feb 21, 2020

Landed in cf00961

@targos targos closed this Feb 21, 2020
@targos targos deleted the sync-gyp branch February 21, 2020 10:12
@sthagen sthagen mentioned this pull request Feb 21, 2020
Merged
4 tasks
codebytere pushed a commit that referenced this pull request Feb 27, 2020
@targos @codebytere
tools: sync gyp code base with node-gyp repo
79b1f04 
PR-URL: #30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@gengjiawen gengjiawen mentioned this pull request Feb 29, 2020
Closed
63 tasks
@codebytere codebytere mentioned this pull request Feb 29, 2020
Merged
codebytere pushed a commit that referenced this pull request Mar 15, 2020
@targos @codebytere
tools: sync gyp code base with node-gyp repo
e8630b0 
PR-URL: #30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
codebytere pushed a commit that referenced this pull request Mar 17, 2020
@targos @codebytere
tools: sync gyp code base with node-gyp repo
15b1597 
PR-URL: #30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@codebytere codebytere mentioned this pull request Mar 17, 2020
Merged
codebytere pushed a commit that referenced this pull request Mar 30, 2020
@targos @codebytere
tools: sync gyp code base with node-gyp repo
aa8a435 
PR-URL: #30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
BaochengSu pushed a commit to BaochengSu/node that referenced this pull request Oct 20, 2020
@targos @BaochengSu
tools: sync gyp code base with node-gyp repo
21ae071 
PR-URL: nodejs#30563
Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org>
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Trott Trott Trott approved these changes

@cclauss cclauss cclauss approved these changes

@BridgeAR BridgeAR BridgeAR approved these changes

@ryzokuken ryzokuken ryzokuken approved these changes

Assignees
No one assigned
Labels
build Issues and PRs related to build files or the CI. tools Issues and PRs related to the tools directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@targos @nodejs-github-bot @cclauss @ryzokuken @Trott @BridgeAR