Skip to content

Conversation

@danbev
Copy link
Contributor

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

src

Description of change

Currently the comment regarding execution of src/node.js seems to refer
to the file before the refactorings done in ec6af31. Also, it looks like
the comment itself might have "drifted" a little in the file.

Updated the comment to refer to the lib/internal/bootstrap_node.js file,
moved it closer to the compilation step, and updated the name that is
generated in node_natives.h.

Currently the comment regarding execution of src/node.js seems to refer to the file before the refactorings done in ec6af31. Also, it looks like the comment itself might have "drifted" a little in the file. Updated the comment to refer to the lib/internal/bootstrap_node.js file, moved it closer to the compilation step, and updated the name that is generated in node_natives.h.
@nodejs-github-botnodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Jun 12, 2016
src/node.cc Outdated
// Compile, execute the lib/internal/bootstrap_node.js file. (Which was
// included as static C string in node_natives.h.
// 'internal_bootstrap_node_native is the string containing that source code.)
Local<String> script_name = FIXED_ONE_BYTE_STRING(env->isolate(), "node.js");
Copy link
Contributor

@mscdexmscdexJun 12, 2016

Choose a reason for hiding this comment

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

Perhaps this script name should be updated too since it has been named bootstrap_node.js for some time now?

Copy link
Contributor

Choose a reason for hiding this comment

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

+1 to updating this.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

I'll take a stab at changing this to bootstrap_node.js.

try_catch.SetVerbose(false);

// Execute the lib/internal/bootstrap_node.js file which was included as a
// static in node_natives.h by node_js2c. 'internal_bootstrap_node_native'
Copy link
Contributor

Choose a reason for hiding this comment

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

static -> static C string

@cjihrig
Copy link
Contributor

Don't forget about #7277 (comment)

src/node.cc Outdated
// is the string containing that source code.
Local<String> script_name = FIXED_ONE_BYTE_STRING(env->isolate(), "node.js");
Local<String> script_name = FIXED_ONE_BYTE_STRING(env->isolate(),
"bootstrap_node.js");
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you line up the opening " with the e in env on the previous line.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

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

Absolutely, move it now.

@mscdex
Copy link
Contributor


Local<String> script_name = FIXED_ONE_BYTE_STRING(env->isolate(), "node.js");
// Execute the lib/internal/bootstrap_node.js file which was included as a
// static in node_natives.h by node_js2c. 'internal_bootstrap_node_native'
Copy link
Contributor

Choose a reason for hiding this comment

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

static -> static C string

@cjihrig
Copy link
Contributor

The CI had a Jenkins failure, and some Alpine failures which have since been corrected. LGTM

@mscdex
Copy link
Contributor

LGTM

@danbev
Copy link
ContributorAuthor

@cjihrig@mscdex Thanks for the reviews!

cjihrig pushed a commit that referenced this pull request Jun 17, 2016
This commit updates the node.js script name to reflect its actual name, which is now bootstrap_node.js. This commit also fixes the requisite message tests, and relocates a comment which seems to have drifted. PR-URL: #7277 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Brian White <[email protected]>
@cjihrig
Copy link
Contributor

Landed in 81b6882. Thanks!

@cjihrigcjihrig closed this Jun 17, 2016
evanlucas pushed a commit that referenced this pull request Jun 27, 2016
This commit updates the node.js script name to reflect its actual name, which is now bootstrap_node.js. This commit also fixes the requisite message tests, and relocates a comment which seems to have drifted. PR-URL: #7277 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Brian White <[email protected]>
@Fishrock123Fishrock123 mentioned this pull request Jun 27, 2016
@Fishrock123Fishrock123 mentioned this pull request Jul 5, 2016
@MylesBorins
Copy link
Contributor

@cjihrig lts?

@cjihrig
Copy link
Contributor

No, I believe this is accurate in v4.

@danbevdanbev deleted the move-and-update-node.js-source-compilation branch September 7, 2016 08:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

c++Issues and PRs that require attention from people who are familiar with C++.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@danbev@cjihrig@mscdex@MylesBorins@nodejs-github-bot