aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/node.cc20
-rw-r--r--src/node.h20
-rw-r--r--src/node.js2
-rw-r--r--src/res/node.ico (renamed from src/res/iojs.ico)bin23284 -> 23284 bytes
-rw-r--r--src/res/node.rc14
-rw-r--r--src/res/node_etw_provider.man4
-rw-r--r--src/res/node_perfctr_provider.man2
-rw-r--r--src/tls_wrap.cc2
8 files changed, 32 insertions, 32 deletions
diff --git a/src/node.cc b/src/node.cc
index a8723dc095..bfb1ebb2f0 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -2768,19 +2768,19 @@ void SetupProcessObject(Environment* env,
// process.release
Local<Object> release = Object::New(env->isolate());
READONLY_PROPERTY(process, "release", release);
- READONLY_PROPERTY(release, "name", OneByteString(env->isolate(), "io.js"));
+ READONLY_PROPERTY(release, "name", OneByteString(env->isolate(), "node.js"));
// if this is a release build and no explicit base has been set
// substitute the standard release download URL
#ifndef NODE_RELEASE_URLBASE
# if NODE_VERSION_IS_RELEASE
-# define NODE_RELEASE_URLBASE "https://iojs.org/download/release/"
+# define NODE_RELEASE_URLBASE "https://nodejs.org/download/release/"
# endif
#endif
#if defined(NODE_RELEASE_URLBASE)
# define _RELEASE_URLPFX NODE_RELEASE_URLBASE "v" NODE_VERSION_STRING "/"
-# define _RELEASE_URLFPFX _RELEASE_URLPFX "iojs-v" NODE_VERSION_STRING
+# define _RELEASE_URLFPFX _RELEASE_URLPFX "node-v" NODE_VERSION_STRING
READONLY_PROPERTY(release,
"sourceUrl",
@@ -2794,7 +2794,7 @@ void SetupProcessObject(Environment* env,
READONLY_PROPERTY(release,
"libUrl",
OneByteString(env->isolate(),
- _RELEASE_URLPFX "win-" NODE_ARCH "/iojs.lib"));
+ _RELEASE_URLPFX "win-" NODE_ARCH "/node.lib"));
# endif
#endif
@@ -3092,11 +3092,11 @@ static bool ParseDebugOpt(const char* arg) {
}
static void PrintHelp() {
- printf("Usage: iojs [options] [ -e script | script.js ] [arguments] \n"
- " iojs debug script.js [arguments] \n"
+ printf("Usage: node [options] [ -e script | script.js ] [arguments] \n"
+ " node debug script.js [arguments] \n"
"\n"
"Options:\n"
- " -v, --version print io.js version\n"
+ " -v, --version print Node.js version\n"
" -e, --eval script evaluate script\n"
" -p, --print evaluate script and print result\n"
" -i, --interactive always enter the REPL even if stdin\n"
@@ -3138,7 +3138,7 @@ static void PrintHelp() {
#endif
#endif
"\n"
- "Documentation can be found at https://iojs.org/\n");
+ "Documentation can be found at https://nodejs.org/\n");
}
@@ -3664,12 +3664,12 @@ void Init(int* argc,
defined(__ARM_ARCH_6T2__) || \
defined(__ARM_ARCH_6ZK__) || \
defined(__ARM_ARCH_6Z__)
- // See https://github.com/nodejs/io.js/issues/1376
+ // See https://github.com/nodejs/node/issues/1376
// and https://code.google.com/p/v8/issues/detail?id=4019
// TODO(bnoordhuis): Remove test/parallel/test-arm-math-exp-regress-1376.js
// and this workaround when v8:4019 has been fixed and the patch back-ported.
V8::SetFlagsFromString("--nofast_math", sizeof("--nofast_math") - 1);
- // See https://github.com/nodejs/io.js/pull/2220#issuecomment-126200059
+ // See https://github.com/nodejs/node/pull/2220#issuecomment-126200059
// and https://code.google.com/p/v8/issues/detail?id=4338
// TODO(targos): Remove this workaround when v8:4338 has been fixed and the
// patch back-ported.
diff --git a/src/node.h b/src/node.h
index acdfe57407..4d85514366 100644
--- a/src/node.h
+++ b/src/node.h
@@ -42,26 +42,26 @@
#include "v8.h" // NOLINT(build/include_order)
#include "node_version.h" // NODE_MODULE_VERSION
-#define IOJS_MAKE_VERSION(major, minor, patch) \
+#define NODE_MAKE_VERSION(major, minor, patch) \
((major) * 0x1000 + (minor) * 0x100 + (patch))
#ifdef __clang__
-# define IOJS_CLANG_AT_LEAST(major, minor, patch) \
- (IOJS_MAKE_VERSION(major, minor, patch) <= \
- IOJS_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__))
+# define NODE_CLANG_AT_LEAST(major, minor, patch) \
+ (NODE_MAKE_VERSION(major, minor, patch) <= \
+ NODE_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__))
#else
-# define IOJS_CLANG_AT_LEAST(major, minor, patch) (0)
+# define NODE_CLANG_AT_LEAST(major, minor, patch) (0)
#endif
#ifdef __GNUC__
-# define IOJS_GNUC_AT_LEAST(major, minor, patch) \
- (IOJS_MAKE_VERSION(major, minor, patch) <= \
- IOJS_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__))
+# define NODE_GNUC_AT_LEAST(major, minor, patch) \
+ (NODE_MAKE_VERSION(major, minor, patch) <= \
+ NODE_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__))
#else
-# define IOJS_GNUC_AT_LEAST(major, minor, patch) (0)
+# define NODE_GNUC_AT_LEAST(major, minor, patch) (0)
#endif
-#if IOJS_CLANG_AT_LEAST(2, 9, 0) || IOJS_GNUC_AT_LEAST(4, 5, 0)
+#if NODE_CLANG_AT_LEAST(2, 9, 0) || NODE_GNUC_AT_LEAST(4, 5, 0)
# define NODE_DEPRECATED(message, declarator) \
__attribute__((deprecated(message))) declarator
#elif defined(_MSC_VER)
diff --git a/src/node.js b/src/node.js
index 685a3692c6..bd91fb888a 100644
--- a/src/node.js
+++ b/src/node.js
@@ -561,7 +561,7 @@
JSON.stringify(name) + ' });\n';
// Defer evaluation for a tick. This is a workaround for deferred
// events not firing when evaluating scripts from the command line,
- // see https://github.com/nodejs/io.js/issues/1600.
+ // see https://github.com/nodejs/node/issues/1600.
process.nextTick(function() {
var result = module._compile(script, name + '-wrapper');
if (process._print_eval) console.log(result);
diff --git a/src/res/iojs.ico b/src/res/node.ico
index fed2026a92..fed2026a92 100644
--- a/src/res/iojs.ico
+++ b/src/res/node.ico
Binary files differ
diff --git a/src/res/node.rc b/src/res/node.rc
index 526f795b18..587843df2f 100644
--- a/src/res/node.rc
+++ b/src/res/node.rc
@@ -3,7 +3,7 @@
// Application icon
-1 ICON iojs.ico
+1 ICON node.ico
// Version resource
@@ -29,14 +29,14 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "io.js"
- VALUE "ProductName", "io.js"
- VALUE "FileDescription", "io.js: Server-side JavaScript"
+ VALUE "CompanyName", "Node.js"
+ VALUE "ProductName", "Node.js"
+ VALUE "FileDescription", "Node.js: Server-side JavaScript"
VALUE "FileVersion", "NODE_VERSION_STRING"
VALUE "ProductVersion", "NODE_VERSION_STRING"
- VALUE "OriginalFilename", "iojs.exe"
- VALUE "InternalName", "iojs"
- VALUE "LegalCopyright", "Copyright io.js contributors. MIT license."
+ VALUE "OriginalFilename", "node.exe"
+ VALUE "InternalName", "node"
+ VALUE "LegalCopyright", "Copyright Node.js contributors. MIT license."
END
END
BLOCK "VarFileInfo"
diff --git a/src/res/node_etw_provider.man b/src/res/node_etw_provider.man
index 9e8c477b11..efdc26d3de 100644
--- a/src/res/node_etw_provider.man
+++ b/src/res/node_etw_provider.man
@@ -7,8 +7,8 @@
<provider name="NodeJS-ETW-provider"
guid="{77754E9B-264B-4D8D-B981-E4135C1ECB0C}"
symbol="NODE_ETW_PROVIDER"
- resourceFileName="iojs.exe"
- messageFileName="iojs.exe">
+ resourceFileName="node.exe"
+ messageFileName="node.exe">
<tasks>
<task name="MethodRuntime" value="1"
diff --git a/src/res/node_perfctr_provider.man b/src/res/node_perfctr_provider.man
index be878148c2..2f77e332f7 100644
--- a/src/res/node_perfctr_provider.man
+++ b/src/res/node_perfctr_provider.man
@@ -6,7 +6,7 @@
<counters xmlns="http://schemas.microsoft.com/win/2005/12/counters"
schemaVersion="1.1">
<provider symbol="NodeCounterProvider"
- applicationIdentity="iojs.exe"
+ applicationIdentity="node.exe"
providerType="userMode"
providerGuid="{793C9B44-3D6B-4F57-B5D7-4FF80ADCF9A2}">
<counterSet symbol="NodeCounterSet"
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index 381690c79d..56dac0fe1f 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -432,7 +432,7 @@ void TLSWrap::ClearOut() {
// We need to check whether an error occurred or the connection was
// shutdown cleanly (SSL_ERROR_ZERO_RETURN) even when read == 0.
- // See iojs#1642 and SSL_read(3SSL) for details.
+ // See node#1642 and SSL_read(3SSL) for details.
if (read <= 0) {
int err;
Local<Value> arg = GetSSLError(read, &err, nullptr);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 23:10:19 +0000