src: move and update comment about 'node.js' compilation. #7277
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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-bot
added
the
c++
| @@ -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 | |||
| // 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"); | |||
There was a problem hiding this comment.
Perhaps this script name should be updated too since it has been named bootstrap_node.js for some time now?
There was a problem hiding this comment.
I'll take a stab at changing this to bootstrap_node.js.
| @@ -3261,6 +3258,9 @@ void LoadEnvironment(Environment* env) { | |||
| // are not safe to ignore. | |||
| 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' | |||
|
Don't forget about #7277 (comment) |
| @@ -3261,7 +3261,8 @@ void LoadEnvironment(Environment* env) { | |||
| // 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' | |||
| // 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"); | |||
There was a problem hiding this comment.
Can you line up the opening " with the e in env on the previous line.
There was a problem hiding this comment.
Absolutely, move it now.
| @@ -3261,7 +3258,11 @@ void LoadEnvironment(Environment* env) { | |||
| // are not safe to ignore. | |||
| try_catch.SetVerbose(false); | |||
|
|
|||
| 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' | |||
|
The CI had a Jenkins failure, and some Alpine failures which have since been corrected. LGTM |
|
LGTM |
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]>
|
Landed in 81b6882. Thanks! |
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]>
Merged
Merged
|
@cjihrig lts? |
|
No, I believe this is accurate in v4. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
make -j4 test(UNIX) orvcbuild test nosign(Windows) passesAffected 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.