Permalink
Browse files

node: rename from io.js to node

This commit replaces instances of io.js with Node.js, based on the
recent convergence. There are some remaining instances of io.js,
related to build and the installer.

Fixes: #2361
PR-URL: #2367
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: João Reis <reis@janeasystems.com>
  • Loading branch information...
cjihrig committed Aug 13, 2015
1 parent ae8d436 commit a69ab27ab458385d24676792b75ad1c25b8c30e5
Showing with 2,162 additions and 2,187 deletions.
  1. +2 −0 .gitignore
  2. +1 −1 BSDmakefile
  3. +1,584 −1,584 CHANGELOG.md
  4. +9 −9 COLLABORATOR_GUIDE.md
  5. +13 −13 CONTRIBUTING.md
  6. +9 −9 GOVERNANCE.md
  7. +6 −6 LICENSE
  8. +18 −18 Makefile
  9. +26 −34 README.md
  10. +15 −15 ROADMAP.md
  11. +31 −31 WORKING_GROUPS.md
  12. +2 −2 benchmark/README.md
  13. +1 −1 benchmark/common.js
  14. +3 −3 benchmark/http-flamegraph.sh
  15. +1 −1 benchmark/http.sh
  16. +5 −5 benchmark/http_simple_bench.sh
  17. +6 −6 benchmark/plot.R
  18. +1 −1 benchmark/plot_csv.R
  19. +4 −4 configure
  20. +2 −2 deps/openssl/config/Makefile
  21. +3 −3 deps/openssl/config/opensslconf.h
  22. +8 −8 deps/openssl/doc/UPGRADING.md
  23. +6 −6 doc/api/addons.markdown
  24. +4 −4 doc/api/buffer.markdown
  25. +18 −17 doc/api/child_process.markdown
  26. +9 −9 doc/api/cluster.markdown
  27. +2 −2 doc/api/crypto.markdown
  28. +12 −12 doc/api/debugger.markdown
  29. +1 −1 doc/api/dgram.markdown
  30. +2 −2 doc/api/dns.markdown
  31. +3 −3 doc/api/documentation.markdown
  32. +1 −1 doc/api/domain.markdown
  33. +26 −26 doc/api/errors.markdown
  34. +2 −2 doc/api/events.markdown
  35. +4 −4 doc/api/fs.markdown
  36. +6 −6 doc/api/globals.markdown
  37. +14 −14 doc/api/http.markdown
  38. +1 −1 doc/api/https.markdown
  39. +26 −26 doc/api/modules.markdown
  40. +3 −3 doc/api/net.markdown
  41. +4 −4 doc/api/path.markdown
  42. +55 −55 doc/api/process.markdown
  43. +3 −3 doc/api/punycode.markdown
  44. +4 −4 doc/api/readline.markdown
  45. +14 −14 doc/api/repl.markdown
  46. +12 −12 doc/api/stream.markdown
  47. +3 −3 doc/api/synopsis.markdown
  48. +1 −1 doc/api/timers.markdown
  49. +3 −3 doc/api/tls.markdown
  50. +5 −5 doc/api/tty.markdown
  51. +3 −3 doc/api/util.markdown
  52. +3 −3 doc/api/v8.markdown
  53. +2 −2 doc/api/zlib.markdown
  54. +6 −6 doc/{iojs.1 → node.1}
  55. +18 −18 doc/releases.md
  56. +4 −4 doc/template.html
  57. +3 −3 lib/_debugger.js
  58. +1 −1 lib/repl.js
  59. +4 −4 node.gyp
  60. +10 −10 src/node.cc
  61. +10 −10 src/node.h
  62. +1 −1 src/node.js
  63. BIN src/res/{iojs.ico → node.ico}
  64. +7 −7 src/res/node.rc
  65. +2 −2 src/res/node_etw_provider.man
  66. +1 −1 src/res/node_perfctr_provider.man
  67. +1 −1 src/tls_wrap.cc
  68. +1 −1 test/common.js
  69. +1 −1 test/fixtures/cluster-preload.js
  70. +1 −1 test/parallel/test-arm-math-exp-regress-1376.js
  71. +1 −1 test/parallel/test-buffer.js
  72. +1 −1 test/parallel/test-event-emitter-get-max-listeners.js
  73. +0 −20 test/parallel/test-fs-read-stream-fd-leak.js
  74. +1 −1 test/parallel/test-path-zero-length-strings.js
  75. +1 −1 test/parallel/test-preload.js
  76. +1 −1 test/parallel/test-repl-tab-complete.js
  77. +1 −1 test/parallel/test-repl.js
  78. +1 −1 test/parallel/test-stringbytes-external.js
  79. +1 −1 test/parallel/test-tls-cnnic-whitelist.js
  80. +1 −1 test/parallel/test-tls-connect-no-host.js
  81. +1 −1 test/parallel/test-url.js
  82. +2 −2 test/parallel/test-vm-debug-context.js
  83. +6 −6 tools/install.py
  84. +5 −5 tools/msvs/msi/i18n/de-de.wxl
  85. +5 −5 tools/msvs/msi/i18n/en-us.wxl
  86. +1 −1 tools/msvs/msi/nodemsi.wixproj
  87. +18 −18 tools/msvs/msi/product.wxs
  88. +6 −6 tools/msvs/nodevars.bat
  89. +1 −1 tools/osx-pkg.pmdoc/02npm.xml
  90. +4 −4 tools/osx-pkg.pmdoc/index.xml.tmpl
  91. +2 −2 tools/release.sh
  92. +7 −7 tools/rpm/{iojs.spec → node.spec}
  93. +4 −4 tools/rpm/rpmbuild.sh
  94. +1 −1 tools/test-npm.sh
  95. +5 −5 tools/test.py
  96. +12 −12 vcbuild.bat
View
@@ -12,6 +12,8 @@ tmp/
test/tmp*/
iojs
iojs_g
node
node_g
*.swp
.benchmark_reports
/.project
View
@@ -4,7 +4,7 @@ FLAGS=${.MAKEFLAGS:C/\-J ([0-9]+,?)+//W}
all: .DEFAULT
.DEFAULT:
@which gmake > /dev/null 2>&1 ||\
(echo "GMake is required for io.js to build.\
(echo "GMake is required for node.js to build.\
Install and try again" && exit 1)
@gmake ${.FLAGS} ${.TARGETS}
View
3,168 CHANGELOG.md

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,4 +1,4 @@
# io.js Collaborator Guide
# Node.js Collaborator Guide
**Contents**
@@ -9,7 +9,7 @@
- [Technical HOWTO](#technical-howto)
- [I Just Made a Mistake](#i-just-made-a-mistake)
This document contains information for Collaborators of the io.js
This document contains information for Collaborators of the Node.js
project regarding maintaining the code, documentation and issues.
Collaborators should be familiar with the guidelines for new
@@ -20,24 +20,24 @@ understand the project governance model as outlined in
## Issues and Pull Requests
Courtesy should always be shown to individuals submitting issues and
pull requests to the io.js project.
pull requests to the Node.js project.
Collaborators should feel free to take full responsibility for
managing issues and pull requests they feel qualified to handle, as
long as this is done while being mindful of these guidelines, the
opinions of other Collaborators and guidance of the TC.
Collaborators may **close** any issue or pull request they believe is
not relevant for the future of the io.js project. Where this is
not relevant for the future of the Node.js project. Where this is
unclear, the issue should be left open for several days to allow for
additional discussion. Where this does not yield input from io.js
additional discussion. Where this does not yield input from Node.js
Collaborators or additional evidence that the issue has relevance, the
issue may be closed. Remember that issues can always be re-opened if
necessary.
## Accepting Modifications
All modifications to the io.js code and documentation should be
All modifications to the Node.js code and documentation should be
performed via GitHub pull requests, including modifications by
Collaborators and TC members.
@@ -101,7 +101,7 @@ information regarding the change process:
appropriate.
See the commit log for examples such as
[this one](https://github.com/nodejs/io.js/commit/b636ba8186) if unsure
[this one](https://github.com/nodejs/node/commit/b636ba8186) if unsure
exactly how to format your commit messages.
Additionally:
@@ -137,7 +137,7 @@ $ git merge --ff-only origin/master
Apply external patches
```text
$ curl -L https://github.com/nodejs/io.js/pull/xxx.patch | git am --whitespace=fix
$ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fix
```
Check and re-review the changes
@@ -223,7 +223,7 @@ With `git`, there's a way to override remote trees by force pushing
(`git push -f`). This should generally be seen as forbidden (since
you're rewriting history on a repository other people are working
against) but is allowed for simpler slip-ups such as typos in commit
messages. However, you are only allowed to force push to any io.js
messages. However, you are only allowed to force push to any Node.js
branch within 10 minutes from your original push. If someone else
pushes to the branch or the 10 minute period passes, consider the
commit final.
View
@@ -1,10 +1,10 @@
# Contributing to io.js
# Contributing to Node.js
## Issue Contributions
When opening new issues or commenting on existing issues on this repository
please make sure discussions are related to concrete technical issues with the
io.js software.
Node.js software.
Discussion of non-technical topics including subjects like intellectual
property, trademark and high level project questions should move to the
@@ -13,7 +13,7 @@ instead.
## Code Contributions
The io.js project has an open governance model and welcomes new contributors.
The Node.js project has an open governance model and welcomes new contributors.
Individuals making significant and valuable contributions are made
_Collaborators_ and given commit-access to the project. See the
[GOVERNANCE.md](./GOVERNANCE.md) document for more information about how this
@@ -23,13 +23,13 @@ This document will guide you through the contribution process.
### Step 1: Fork
Fork the project [on GitHub](https://github.com/nodejs/io.js) and check out your
Fork the project [on GitHub](https://github.com/nodejs/node) and check out your
copy locally.
```text
$ git clone git@github.com:username/io.js.git
$ cd io.js
$ git remote add upstream git://github.com/nodejs/io.js.git
$ git clone git@github.com:username/node.git
$ cd node
$ git remote add upstream git://github.com/nodejs/node.git
```
#### Which branch?
@@ -48,14 +48,14 @@ always welcome but API or behavioral changes to modules at stability level 3
#### Dependencies
io.js has several bundled dependencies in the *deps/* and the *tools/*
Node.js has several bundled dependencies in the *deps/* and the *tools/*
directories that are not part of the project proper. Any changes to files
in those directories or its subdirectories should be sent to their respective
projects. Do not send your patch to us, we cannot accept it.
In case of doubt, open an issue in the
[issue tracker](https://github.com/nodejs/io.js/issues/) or contact one of the
[project Collaborators](https://github.com/nodejs/io.js/#current-project-team-members).
[issue tracker](https://github.com/nodejs/node/issues/) or contact one of the
[project Collaborators](https://github.com/nodejs/node/#current-project-team-members).
([IRC](http://webchat.freenode.net/?channels=io.js) is often the best medium.) Especially do so if you plan to work on something big. Nothing is more
frustrating than seeing your hard work go to waste because your vision
does not align with the project team.
@@ -139,10 +139,10 @@ can use this syntax to run it exactly as the test harness would:
$ python tools/test.py -v --mode=release parallel/test-stream2-transform
```
You can run tests directly with iojs:
You can run tests directly with node:
```text
$ ./iojs ./test/parallel/test-stream2-transform.js
$ ./node ./test/parallel/test-stream2-transform.js
```
Remember to recompile with `make -j8` in between test runs if you change
@@ -154,7 +154,7 @@ core modules.
$ git push origin my-feature-branch
```
Go to https://github.com/yourusername/io.js and select your feature branch.
Go to https://github.com/yourusername/node and select your feature branch.
Click the 'Pull Request' button and fill out the form.
Pull requests are usually reviewed within a few days. If there are comments
View
@@ -1,11 +1,11 @@
# io.js Project Governance
# Node.js Project Governance
## Technical Committee
The io.js project is jointly governed by a Technical Committee (TC)
The Node.js project is jointly governed by a Technical Steering Committee (TSC)
which is responsible for high-level guidance of the project.
The TC has final authority over this project including:
The TSC has final authority over this project including:
* Technical direction
* Project governance and process (including this policy)
@@ -14,17 +14,17 @@ The TC has final authority over this project including:
* Conduct guidelines
* Maintaining the list of additional Collaborators
Initial membership invitations to the TC were given to individuals who
had been active contributors to io.js, and who have significant
experience with the management of the io.js project. Membership is
Initial membership invitations to the TSC were given to individuals who
had been active contributors to Node.js, and who have significant
experience with the management of the Node.js project. Membership is
expected to evolve over time according to the needs of the project.
For the current list of TC members, see the project
For the current list of TSC members, see the project
[README.md](./README.md#current-project-team-members).
## Collaborators
The [iojs/io.js](https://github.com/nodejs/io.js) GitHub repository is
The [nodejs/node](https://github.com/nodejs/node) GitHub repository is
maintained by the TC and additional Collaborators who are added by the
TC on an ongoing basis.
@@ -37,7 +37,7 @@ _Note:_ If you make a significant contribution and are not considered
for commit-access, log an issue or contact a TC member directly and it
will be brought up in the next TC meeting.
Modifications of the contents of the iojs/io.js repository are made on
Modifications of the contents of the nodejs/node repository are made on
a collaborative basis. Anybody with a GitHub account may propose a
modification via pull request and it will be considered by the project
Collaborators. All pull requests must be reviewed and accepted by a
View
12 LICENSE
@@ -1,7 +1,7 @@
io.js is licensed for use as follows:
Node.js is licensed for use as follows:
"""
Copyright io.js contributors. All rights reserved.
Copyright Node.js contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -22,7 +22,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
"""
This license applies to parts of io.js originating from the
This license applies to parts of Node.js originating from the
https://github.com/joyent/node repository:
"""
@@ -46,10 +46,10 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
"""
The io.js license applies to all parts of io.js that are not externally
The Node.js license applies to all parts of Node.js that are not externally
maintained libraries.
The externally maintained libraries used by io.js are:
The externally maintained libraries used by Node.js are:
- V8, located at deps/v8. V8's license follows:
"""
@@ -612,7 +612,7 @@ The externally maintained libraries used by io.js are:
included for use in the npm website and documentation,
used with permission.
This program uses several io.js modules contained in the node_modules/
This program uses several Node.js modules contained in the node_modules/
subdirectory, according to the terms of their respective licenses.
"""
View
@@ -5,17 +5,17 @@ PYTHON ?= python
DESTDIR ?=
SIGN ?=
PREFIX ?= /usr/local
STAGINGSERVER ?= iojs-www
STAGINGSERVER ?= node-www
OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
# Determine EXEEXT
EXEEXT := $(shell $(PYTHON) -c \
"import sys; print('.exe' if sys.platform == 'win32' else '')")
NODE ?= ./iojs$(EXEEXT)
NODE_EXE = iojs$(EXEEXT)
NODE_G_EXE = iojs_g$(EXEEXT)
NODE ?= ./node$(EXEEXT)
NODE_EXE = node$(EXEEXT)
NODE_G_EXE = node_g$(EXEEXT)
# Flags for packaging.
BUILD_DOWNLOAD_FLAGS ?= --download=all
@@ -267,7 +267,7 @@ ifeq ($(DESTCPU),ia32)
override DESTCPU=x86
endif
TARNAME=iojs-$(FULLVERSION)
TARNAME=node-$(FULLVERSION)
TARBALL=$(TARNAME).tar
BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
BINARYTAR=$(BINARYNAME).tar
@@ -311,11 +311,11 @@ $(PKG): release-only
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
cat tools/osx-pkg.pmdoc/index.xml.tmpl \
| sed -E "s/\\{iojsversion\\}/$(FULLVERSION)/g" \
| sed -E "s/\\{nodeversion\\}/$(FULLVERSION)/g" \
| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
> tools/osx-pkg.pmdoc/index.xml
$(PACKAGEMAKER) \
--id "org.iojs.pkg" \
--id "org.node.pkg" \
--doc tools/osx-pkg.pmdoc \
--out $(PKG)
SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
@@ -324,13 +324,13 @@ pkg: $(PKG)
pkg-upload: pkg
ssh $(STAGINGSERVER) "mkdir -p staging/$(DISTTYPEDIR)/$(FULLVERSION)"
scp -p iojs-$(FULLVERSION).pkg $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).pkg
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).pkg.done"
scp -p node-$(FULLVERSION).pkg $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).pkg
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).pkg.done"
$(TARBALL): release-only $(NODE_EXE) doc
git checkout-index -a -f --prefix=$(TARNAME)/
mkdir -p $(TARNAME)/doc/api
cp doc/iojs.1 $(TARNAME)/doc/iojs.1
cp doc/node.1 $(TARNAME)/doc/node.1
cp -r out/doc/api/* $(TARNAME)/doc/api/
rm -rf $(TARNAME)/deps/v8/{test,samples,tools/profviz} # too big
rm -rf $(TARNAME)/doc/images # too big
@@ -350,11 +350,11 @@ tar: $(TARBALL)
tar-upload: tar
ssh $(STAGINGSERVER) "mkdir -p staging/$(DISTTYPEDIR)/$(FULLVERSION)"
scp -p iojs-$(FULLVERSION).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.gz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.gz.done"
scp -p node-$(FULLVERSION).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.gz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.gz.done"
ifeq ($(XZ), 0)
scp -p iojs-$(FULLVERSION).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.xz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.xz.done"
scp -p node-$(FULLVERSION).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.xz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.xz.done"
endif
doc-upload: tar
@@ -415,11 +415,11 @@ binary: $(BINARYTAR)
binary-upload: binary
ssh $(STAGINGSERVER) "mkdir -p staging/$(DISTTYPEDIR)/$(FULLVERSION)"
scp -p iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz.done"
scp -p node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz.done"
ifeq ($(XZ), 0)
scp -p iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz.done"
scp -p node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz.done"
endif
haswrk=$(shell which wrk > /dev/null 2>&1; echo $$?)
Oops, something went wrong.

0 comments on commit a69ab27

Please sign in to comment.