Skip to content

tools: pull xcode_emulation.py fixes from node-gyp - #30272

Closed
cclauss wants to merge 2 commits into
nodejs:masterfrom
cclauss:fix-xcode_emulation.py
Closed

tools: pull xcode_emulation.py fixes from node-gyp#30272
cclauss wants to merge 2 commits into
nodejs:masterfrom
cclauss:fix-xcode_emulation.py

Conversation

@cclauss

@cclausscclauss commented Nov 5, 2019

Copy link
Copy Markdown
Contributor

Fixes: #30129

This change copes several Python 3 fixes from node-gyp's copy of xcode_emulation.py to the /tools copy of that file. In particular, the changes from nodejs/node-gyp#1890nodejs/node-gyp#1895nodejs/node-gyp#1932 and nodejs/node-gyp#1939 are contained in this pull request

See #30129 (comment)
FYI: @chrmoritz

Checklist

@nodejs-github-botnodejs-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 5, 2019
@cclausscclauss added the python PRs and issues that require attention from people who are familiar with Python. label Nov 5, 2019
@cclausscclauss changed the title tools: pull xcode_emulation.py from node-gyptools: pull xcode_emulation.py fixes from node-gypNov 5, 2019
@cclausscclauss mentioned this pull request Nov 5, 2019
Closed
63 tasks
@chrmoritz

chrmoritz commented Nov 5, 2019•
edited
Loading

Copy link
Copy Markdown

Thanks @cclauss. I'm currently testing also my backport in master...chrmoritz:macosPy3, but this is more complete.

The only thing missing here is a backport of nodejs/node-gyp@a48f09b#diff-a486ea7ed25fd07c6c5a3aee31ed8308, which would be required for making PYTHON=python3 make work too. (But this is currently only breaking the probably small number of users on macOS, who have python on the PATH pointing to a Python 3 instead of system (or whatever) Python 2.)

@nodejs-github-bot

nodejs-github-bot commented Nov 6, 2019

Copy link
Copy Markdown
Collaborator

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

@ZYSzys

ZYSzys commented Nov 6, 2019

Copy link
Copy Markdown
Member

Could this be fast-track ?

@nodejs-github-bot

nodejs-github-bot commented Nov 6, 2019

Copy link
Copy Markdown
Collaborator

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

@ChALkeRChALkeR added the fast-track PRs that do not need to wait for 48 hours to land. label Nov 6, 2019
@nodejs-github-bot

nodejs-github-bot commented Nov 6, 2019

Copy link
Copy Markdown
Collaborator

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

ChALkeR pushed a commit that referenced this pull request Nov 6, 2019
@cclauss@ChALkeR
tools: pull xcode_emulation.py from node-gyp
0673dfc
PR-URL: #30272Fixes: #30129
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@ChALkeR

ChALkeR commented Nov 6, 2019

Copy link
Copy Markdown
Member

Landed in 0673dfc.

@ChALkeRChALkeR closed this Nov 6, 2019
@cclauss
cclauss deleted the fix-xcode_emulation.py branch November 6, 2019 10:10
@targostargos mentioned this pull request Nov 13, 2019
Closed
targos pushed a commit that referenced this pull request Nov 14, 2019
@cclauss@targos
tools: pull xcode_emulation.py from node-gyp
b9fd18f
PR-URL: #30272Fixes: #30129
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@targostargos mentioned this pull request Nov 14, 2019
Merged
MylesBorins pushed a commit that referenced this pull request Nov 17, 2019
@cclauss@MylesBorins
tools: pull xcode_emulation.py from node-gyp
3a44ade
PR-URL: #30272Fixes: #30129
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
@BridgeARBridgeAR mentioned this pull request Nov 19, 2019
Merged
@mattfickemattficke mentioned this pull request Jul 2, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@codebyterecodebyterecodebytere approved these changes
@targostargostargos approved these changes
@richardlaurichardlaurichardlau approved these changes
@ZYSzysZYSzysZYSzys approved these changes
@sam-githubsam-githubAwaiting requested review from sam-github
@TrottTrottAwaiting requested review from Trott
+1 more reviewer
@danbevdanbevdanbev approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

buildIssues and PRs related to build files or the CI.fast-trackPRs that do not need to wait for 48 hours to land.pythonPRs and issues that require attention from people who are familiar with Python.toolsIssues and PRs related to the tools directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

./configure fails after Python version default changed

9 participants

@cclauss@chrmoritz@nodejs-github-bot@ZYSzys@ChALkeR@danbev@codebytere@targos@richardlau