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.

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

build: reduce one level of spawning in node_gyp #12653

Merged
merged 2 commits into from May 16, 2017

Conversation

Projects
None yet
5 participants
@refack
Member

refack commented Apr 25, 2017

configure will now call node_gyp as a module instead of forking
makes it easier to debug

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

build

@refack refack requested a review from sam-github Apr 25, 2017

@refack refack self-assigned this Apr 25, 2017

Show outdated Hide outdated tools/gyp_node.py
args.append(os.path.join(arg_path, 'node.gyp'))
common_fn = os.path.join(arg_path, 'common.gypi')
options_fn = os.path.join(arg_path, 'config.gypi')
options_fips_fn = os.path.join(arg_path, 'config_fips.gypi')

This comment has been minimized.

@bnoordhuis

bnoordhuis Apr 26, 2017

Member

Don't make unrelated changes in a single commit, split it out into two commits.

@bnoordhuis

bnoordhuis Apr 26, 2017

Member

Don't make unrelated changes in a single commit, split it out into two commits.

This comment has been minimized.

@refack

refack Apr 26, 2017

Member

Split. or should it be Splat Done.

@refack

refack Apr 26, 2017

Member

Split. or should it be Splat Done.

Show outdated Hide outdated configure
@@ -1400,4 +1401,5 @@ gyp_args += args
if warn.warned:
warn('warnings were emitted in the configure phase')
sys.exit(subprocess.call(gyp_args))
errorlevel = run_gyp(gyp_args)
sys.exit(errorlevel)

This comment has been minimized.

@bnoordhuis

bnoordhuis Apr 26, 2017

Member

Superfluous. errorlevel is always zero because run_gyp() exits on error.

@bnoordhuis

bnoordhuis Apr 26, 2017

Member

Superfluous. errorlevel is always zero because run_gyp() exits on error.

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack Apr 26, 2017

Member

@bnoordhuis fixed PTAL

Member

refack commented Apr 26, 2017

@bnoordhuis fixed PTAL

@bnoordhuis

LGTM modulo comments.

Show outdated Hide outdated tools/gyp_node.py
options_fips_fn = os.path.join(os.path.abspath(node_root), 'config_fips.gypi')
arg_path = node_root if sys.platform == 'win32' else os.path.abspath(node_root)
args.append(os.path.join(arg_path, 'node.gyp'))
common_fn = os.path.join(arg_path, 'common.gypi')

This comment has been minimized.

@bnoordhuis

bnoordhuis May 15, 2017

Member

While you're here, can you drop the extraneous space before the =?

@bnoordhuis

bnoordhuis May 15, 2017

Member

While you're here, can you drop the extraneous space before the =?

Show outdated Hide outdated tools/gyp_node.py
common_fn = os.path.join(os.path.abspath(node_root), 'common.gypi')
options_fn = os.path.join(os.path.abspath(node_root), 'config.gypi')
options_fips_fn = os.path.join(os.path.abspath(node_root), 'config_fips.gypi')
arg_path = node_root if sys.platform == 'win32' else os.path.abspath(node_root)

This comment has been minimized.

@bnoordhuis

bnoordhuis May 15, 2017

Member

Long line?

@bnoordhuis

bnoordhuis May 15, 2017

Member

Long line?

Show outdated Hide outdated tools/gyp_node.py
if __name__ == '__main__':
args = sys.argv[1:]
gyp_args = list(args)
run_gyp(gyp_args)

This comment has been minimized.

@bnoordhuis

bnoordhuis May 15, 2017

Member

You can just run_gyp(sys.argv[1:]) here, it's already a list.

@bnoordhuis

bnoordhuis May 15, 2017

Member

You can just run_gyp(sys.argv[1:]) here, it's already a list.

@bnoordhuis

This comment has been minimized.

Show comment
Hide comment
@bnoordhuis

bnoordhuis May 15, 2017

Member

By the way, the second commit log should be brought up to par with the style guide.

Member

bnoordhuis commented May 15, 2017

By the way, the second commit log should be brought up to par with the style guide.

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack May 15, 2017

Member

By the way, the second commit log should be brought up to par with the style guide.

Ack

Member

refack commented May 15, 2017

By the way, the second commit log should be brought up to par with the style guide.

Ack

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack May 15, 2017

Member

Addressed all comments and rebased.
I'll leave this here another day...
/cc @nodejs/build
CI: https://ci.nodejs.org/job/node-test-commit/9896/
(CI fails are false negatives)

Member

refack commented May 15, 2017

Addressed all comments and rebased.
I'll leave this here another day...
/cc @nodejs/build
CI: https://ci.nodejs.org/job/node-test-commit/9896/
(CI fails are false negatives)

refack added some commits Apr 25, 2017

build: reduce one level of spawning in node_gyp
`configure` will now call `node_gyp` as a module instead of forking
makes it easier to debug

PR-URL: #12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
build: simplify `if` in setting of arg_paths
PR-URL: #12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@refack refack merged commit 8035527 into nodejs:master May 16, 2017

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack May 16, 2017

Member

landed in 8035527

Member

refack commented May 16, 2017

landed in 8035527

@refack

This comment has been minimized.

Show comment
Hide comment
@refack
Member

refack commented May 16, 2017

Post land double check master: https://ci.nodejs.org/job/node-test-commit/9928/

@refack refack deleted the refack:node-gyp-opt branch May 16, 2017

@refack refack restored the refack:node-gyp-opt branch May 16, 2017

anchnk added a commit to anchnk/node that referenced this pull request May 19, 2017

build: reduce one level of spawning in node_gyp
`configure` will now call `node_gyp` as a module instead of forking
makes it easier to debug

PR-URL: nodejs#12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

anchnk added a commit to anchnk/node that referenced this pull request May 19, 2017

build: simplify `if` in setting of arg_paths
PR-URL: nodejs#12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@refack refack deleted the refack:node-gyp-opt branch May 19, 2017

@refack refack restored the refack:node-gyp-opt branch May 25, 2017

@jasnell jasnell referenced this pull request May 28, 2017

Closed

8.0.0 Release Proposal #12220

@refack refack deleted the refack:node-gyp-opt branch Jun 10, 2017

@refack refack removed their assignment Jun 12, 2017

@gibfahn gibfahn referenced this pull request Jun 15, 2017

Closed

Auditing for 6.11.1 #230

2 of 3 tasks complete
@MylesBorins

This comment has been minimized.

Show comment
Hide comment
@MylesBorins

MylesBorins Jun 22, 2017

Member

should this be backported to v6.x?

Member

MylesBorins commented Jun 22, 2017

should this be backported to v6.x?

@refack

This comment has been minimized.

Show comment
Hide comment
@refack

refack Jun 22, 2017

Member

should this be backported to v6.x?

I think so.

Member

refack commented Jun 22, 2017

should this be backported to v6.x?

I think so.

MylesBorins added a commit that referenced this pull request Jun 23, 2017

build: simplify `if` in setting of arg_paths
PR-URL: #12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

MylesBorins added a commit that referenced this pull request Jul 11, 2017

build: simplify `if` in setting of arg_paths
PR-URL: #12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@MylesBorins MylesBorins referenced this pull request Jul 18, 2017

Merged

v6.11.2 proposal #14356

MylesBorins added a commit that referenced this pull request Aug 14, 2017

build: reduce one level of spawning in node_gyp
`configure` will now call `node_gyp` as a module instead of forking
makes it easier to debug

PR-URL: #12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

MylesBorins added a commit that referenced this pull request Aug 16, 2017

build: reduce one level of spawning in node_gyp
`configure` will now call `node_gyp` as a module instead of forking
makes it easier to debug

PR-URL: #12653
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

@MylesBorins MylesBorins referenced this pull request Aug 16, 2017

Merged

v6.11.3-proposal #14852

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment