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

src: move and update comment about 'node.js' compilation. #7277

Closed
wants to merge 4 commits into from
Closed

src: move and update comment about 'node.js' compilation. #7277

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f19e968
src: move and update comment about 'node.js' compilation.
danbev Jun 12, 2016
b35dcce
Clarifying the comment after suggestions from reviewers.
danbev Jun 13, 2016
481c628
src: renaming 'node.js' to 'bootstrap_node.js'
danbev Jun 14, 2016
bff57c3
Fixing indentation of "bootstrap_node.js" argument.
danbev Jun 14, 2016
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
6 changes: 3 additions & 3 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3247,9 +3247,6 @@ void LoadEnvironment(Environment* env) {
env->isolate()->SetFatalErrorHandler(node::OnFatalError);
env->isolate()->AddMessageListener(OnMessage);

// Compile, execute the src/node.js file. (Which was included as static C
// string in node_natives.h. 'native_node' is the string containing that
// source code.)

// The node.js file returns a function 'f'
atexit(AtExit);
Expand All @@ -3261,6 +3258,9 @@ void LoadEnvironment(Environment* env) {
// are not safe to ignore.
try_catch.SetVerbose(false);

// Compile, execute the lib/internal/bootstrap_node.js file. (Which was
Copy link
Contributor

Choose a reason for hiding this comment

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

Compile and execute. I know it was like this before, but if we're moving it, we might as well fix it.

Copy link
Contributor

Choose a reason for hiding this comment

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

file, which was. Then, drop the ending ).

// included as static C string in node_natives.h.
Copy link
Contributor

Choose a reason for hiding this comment

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

as a static

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cjihrig Thanks, I've added a commit based on your suggestions. Let me know what you think.

// '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

@mscdex mscdex Jun 12, 2016 •
edited
Loading

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
Contributor Author

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.

Local<Value> f_value = ExecuteString(env, MainSource(env), script_name);
if (try_catch.HasCaught()) {
Expand Down