Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a69ab27

Browse filesBrowse files
cjihrigcjihrig
committed
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>
1 parent ae8d436 commit a69ab27
Copy full SHA for a69ab27

File tree

Expand file treeCollapse file tree

96 files changed

+2162
-2187
lines changed
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

96 files changed

+2162
-2187
lines changed
Open diff view settings
Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ tmp/
1212
test/tmp*/
1313
iojs
1414
iojs_g
15+
node
16+
node_g
1517
*.swp
1618
.benchmark_reports
1719
/.project
Collapse file

‎BSDmakefile‎

Copy file name to clipboardExpand all lines: BSDmakefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FLAGS=${.MAKEFLAGS:C/\-J ([0-9]+,?)+//W}
44
all: .DEFAULT
55
.DEFAULT:
66
@which gmake > /dev/null 2>&1 ||\
7-
(echo "GMake is required for io.js to build.\
7+
(echo "GMake is required for node.js to build.\
88
Install and try again" && exit 1)
99
@gmake ${.FLAGS} ${.TARGETS}
1010

Collapse file

‎CHANGELOG.md‎

Copy file name to clipboardExpand all lines: CHANGELOG.md
+1,584-1,584Lines changed: 1584 additions & 1584 deletions
  • Display the source diff
  • Display the rich diff
Large diffs are not rendered by default.
Collapse file

‎COLLABORATOR_GUIDE.md‎

Copy file name to clipboardExpand all lines: COLLABORATOR_GUIDE.md
+9-9Lines changed: 9 additions & 9 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# io.js Collaborator Guide
1+
# Node.js Collaborator Guide
22

33
**Contents**
44

@@ -9,7 +9,7 @@
99
- [Technical HOWTO](#technical-howto)
1010
- [I Just Made a Mistake](#i-just-made-a-mistake)
1111

12-
This document contains information for Collaborators of the io.js
12+
This document contains information for Collaborators of the Node.js
1313
project regarding maintaining the code, documentation and issues.
1414

1515
Collaborators should be familiar with the guidelines for new
@@ -20,24 +20,24 @@ understand the project governance model as outlined in
2020
## Issues and Pull Requests
2121

2222
Courtesy should always be shown to individuals submitting issues and
23-
pull requests to the io.js project.
23+
pull requests to the Node.js project.
2424

2525
Collaborators should feel free to take full responsibility for
2626
managing issues and pull requests they feel qualified to handle, as
2727
long as this is done while being mindful of these guidelines, the
2828
opinions of other Collaborators and guidance of the TC.
2929

3030
Collaborators may **close** any issue or pull request they believe is
31-
not relevant for the future of the io.js project. Where this is
31+
not relevant for the future of the Node.js project. Where this is
3232
unclear, the issue should be left open for several days to allow for
33-
additional discussion. Where this does not yield input from io.js
33+
additional discussion. Where this does not yield input from Node.js
3434
Collaborators or additional evidence that the issue has relevance, the
3535
issue may be closed. Remember that issues can always be re-opened if
3636
necessary.
3737

3838
## Accepting Modifications
3939

40-
All modifications to the io.js code and documentation should be
40+
All modifications to the Node.js code and documentation should be
4141
performed via GitHub pull requests, including modifications by
4242
Collaborators and TC members.
4343

@@ -101,7 +101,7 @@ information regarding the change process:
101101
appropriate.
102102

103103
See the commit log for examples such as
104-
[this one](https://github.com/nodejs/io.js/commit/b636ba8186) if unsure
104+
[this one](https://github.com/nodejs/node/commit/b636ba8186) if unsure
105105
exactly how to format your commit messages.
106106

107107
Additionally:
@@ -137,7 +137,7 @@ $ git merge --ff-only origin/master
137137
Apply external patches
138138

139139
```text
140-
$ curl -L https://github.com/nodejs/io.js/pull/xxx.patch | git am --whitespace=fix
140+
$ curl -L https://github.com/nodejs/node/pull/xxx.patch | git am --whitespace=fix
141141
```
142142

143143
Check and re-review the changes
@@ -223,7 +223,7 @@ With `git`, there's a way to override remote trees by force pushing
223223
(`git push -f`). This should generally be seen as forbidden (since
224224
you're rewriting history on a repository other people are working
225225
against) but is allowed for simpler slip-ups such as typos in commit
226-
messages. However, you are only allowed to force push to any io.js
226+
messages. However, you are only allowed to force push to any Node.js
227227
branch within 10 minutes from your original push. If someone else
228228
pushes to the branch or the 10 minute period passes, consider the
229229
commit final.
Collapse file

‎CONTRIBUTING.md‎

Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+13-13Lines changed: 13 additions & 13 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Contributing to io.js
1+
# Contributing to Node.js
22

33
## Issue Contributions
44

55
When opening new issues or commenting on existing issues on this repository
66
please make sure discussions are related to concrete technical issues with the
7-
io.js software.
7+
Node.js software.
88

99
Discussion of non-technical topics including subjects like intellectual
1010
property, trademark and high level project questions should move to the
@@ -13,7 +13,7 @@ instead.
1313

1414
## Code Contributions
1515

16-
The io.js project has an open governance model and welcomes new contributors.
16+
The Node.js project has an open governance model and welcomes new contributors.
1717
Individuals making significant and valuable contributions are made
1818
_Collaborators_ and given commit-access to the project. See the
1919
[GOVERNANCE.md](./GOVERNANCE.md) document for more information about how this
@@ -23,13 +23,13 @@ This document will guide you through the contribution process.
2323

2424
### Step 1: Fork
2525

26-
Fork the project [on GitHub](https://github.com/nodejs/io.js) and check out your
26+
Fork the project [on GitHub](https://github.com/nodejs/node) and check out your
2727
copy locally.
2828

2929
```text
30-
$ git clone git@github.com:username/io.js.git
31-
$ cd io.js
32-
$ git remote add upstream git://github.com/nodejs/io.js.git
30+
$ git clone git@github.com:username/node.git
31+
$ cd node
32+
$ git remote add upstream git://github.com/nodejs/node.git
3333
```
3434

3535
#### Which branch?
@@ -48,14 +48,14 @@ always welcome but API or behavioral changes to modules at stability level 3
4848

4949
#### Dependencies
5050

51-
io.js has several bundled dependencies in the *deps/* and the *tools/*
51+
Node.js has several bundled dependencies in the *deps/* and the *tools/*
5252
directories that are not part of the project proper. Any changes to files
5353
in those directories or its subdirectories should be sent to their respective
5454
projects. Do not send your patch to us, we cannot accept it.
5555

5656
In case of doubt, open an issue in the
57-
[issue tracker](https://github.com/nodejs/io.js/issues/) or contact one of the
58-
[project Collaborators](https://github.com/nodejs/io.js/#current-project-team-members).
57+
[issue tracker](https://github.com/nodejs/node/issues/) or contact one of the
58+
[project Collaborators](https://github.com/nodejs/node/#current-project-team-members).
5959
([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
6060
frustrating than seeing your hard work go to waste because your vision
6161
does not align with the project team.
@@ -139,10 +139,10 @@ can use this syntax to run it exactly as the test harness would:
139139
$ python tools/test.py -v --mode=release parallel/test-stream2-transform
140140
```
141141

142-
You can run tests directly with iojs:
142+
You can run tests directly with node:
143143

144144
```text
145-
$ ./iojs ./test/parallel/test-stream2-transform.js
145+
$ ./node ./test/parallel/test-stream2-transform.js
146146
```
147147

148148
Remember to recompile with `make -j8` in between test runs if you change
@@ -154,7 +154,7 @@ core modules.
154154
$ git push origin my-feature-branch
155155
```
156156

157-
Go to https://github.com/yourusername/io.js and select your feature branch.
157+
Go to https://github.com/yourusername/node and select your feature branch.
158158
Click the 'Pull Request' button and fill out the form.
159159

160160
Pull requests are usually reviewed within a few days. If there are comments
Collapse file

‎GOVERNANCE.md‎

Copy file name to clipboardExpand all lines: GOVERNANCE.md
+9-9Lines changed: 9 additions & 9 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# io.js Project Governance
1+
# Node.js Project Governance
22

33
## Technical Committee
44

5-
The io.js project is jointly governed by a Technical Committee (TC)
5+
The Node.js project is jointly governed by a Technical Steering Committee (TSC)
66
which is responsible for high-level guidance of the project.
77

8-
The TC has final authority over this project including:
8+
The TSC has final authority over this project including:
99

1010
* Technical direction
1111
* Project governance and process (including this policy)
@@ -14,17 +14,17 @@ The TC has final authority over this project including:
1414
* Conduct guidelines
1515
* Maintaining the list of additional Collaborators
1616

17-
Initial membership invitations to the TC were given to individuals who
18-
had been active contributors to io.js, and who have significant
19-
experience with the management of the io.js project. Membership is
17+
Initial membership invitations to the TSC were given to individuals who
18+
had been active contributors to Node.js, and who have significant
19+
experience with the management of the Node.js project. Membership is
2020
expected to evolve over time according to the needs of the project.
2121

22-
For the current list of TC members, see the project
22+
For the current list of TSC members, see the project
2323
[README.md](./README.md#current-project-team-members).
2424

2525
## Collaborators
2626

27-
The [iojs/io.js](https://github.com/nodejs/io.js) GitHub repository is
27+
The [nodejs/node](https://github.com/nodejs/node) GitHub repository is
2828
maintained by the TC and additional Collaborators who are added by the
2929
TC on an ongoing basis.
3030

@@ -37,7 +37,7 @@ _Note:_ If you make a significant contribution and are not considered
3737
for commit-access, log an issue or contact a TC member directly and it
3838
will be brought up in the next TC meeting.
3939

40-
Modifications of the contents of the iojs/io.js repository are made on
40+
Modifications of the contents of the nodejs/node repository are made on
4141
a collaborative basis. Anybody with a GitHub account may propose a
4242
modification via pull request and it will be considered by the project
4343
Collaborators. All pull requests must be reviewed and accepted by a
Collapse file

‎LICENSE‎

Copy file name to clipboardExpand all lines: LICENSE
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
io.js is licensed for use as follows:
1+
Node.js is licensed for use as follows:
22

33
"""
4-
Copyright io.js contributors. All rights reserved.
4+
Copyright Node.js contributors. All rights reserved.
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
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
2222
IN THE SOFTWARE.
2323
"""
2424

25-
This license applies to parts of io.js originating from the
25+
This license applies to parts of Node.js originating from the
2626
https://github.com/joyent/node repository:
2727

2828
"""
@@ -46,10 +46,10 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
4646
IN THE SOFTWARE.
4747
"""
4848

49-
The io.js license applies to all parts of io.js that are not externally
49+
The Node.js license applies to all parts of Node.js that are not externally
5050
maintained libraries.
5151

52-
The externally maintained libraries used by io.js are:
52+
The externally maintained libraries used by Node.js are:
5353

5454
- V8, located at deps/v8. V8's license follows:
5555
"""
@@ -612,7 +612,7 @@ The externally maintained libraries used by io.js are:
612612
included for use in the npm website and documentation,
613613
used with permission.
614614

615-
This program uses several io.js modules contained in the node_modules/
615+
This program uses several Node.js modules contained in the node_modules/
616616
subdirectory, according to the terms of their respective licenses.
617617
"""
618618

Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+18-18Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ PYTHON ?= python
55
DESTDIR ?=
66
SIGN ?=
77
PREFIX ?= /usr/local
8-
STAGINGSERVER ?= iojs-www
8+
STAGINGSERVER ?= node-www
99

1010
OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
1111

1212
# Determine EXEEXT
1313
EXEEXT := $(shell $(PYTHON) -c \
1414
"import sys; print('.exe' if sys.platform == 'win32' else '')")
1515

16-
NODE ?= ./iojs$(EXEEXT)
17-
NODE_EXE = iojs$(EXEEXT)
18-
NODE_G_EXE = iojs_g$(EXEEXT)
16+
NODE ?= ./node$(EXEEXT)
17+
NODE_EXE = node$(EXEEXT)
18+
NODE_G_EXE = node_g$(EXEEXT)
1919

2020
# Flags for packaging.
2121
BUILD_DOWNLOAD_FLAGS ?= --download=all
@@ -267,7 +267,7 @@ ifeq ($(DESTCPU),ia32)
267267
override DESTCPU=x86
268268
endif
269269

270-
TARNAME=iojs-$(FULLVERSION)
270+
TARNAME=node-$(FULLVERSION)
271271
TARBALL=$(TARNAME).tar
272272
BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
273273
BINARYTAR=$(BINARYNAME).tar
@@ -311,11 +311,11 @@ $(PKG): release-only
311311
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
312312
SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
313313
cat tools/osx-pkg.pmdoc/index.xml.tmpl \
314-
| sed -E "s/\\{iojsversion\\}/$(FULLVERSION)/g" \
314+
| sed -E "s/\\{nodeversion\\}/$(FULLVERSION)/g" \
315315
| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
316316
> tools/osx-pkg.pmdoc/index.xml
317317
$(PACKAGEMAKER) \
318-
--id "org.iojs.pkg" \
318+
--id "org.node.pkg" \
319319
--doc tools/osx-pkg.pmdoc \
320320
--out $(PKG)
321321
SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
@@ -324,13 +324,13 @@ pkg: $(PKG)
324324

325325
pkg-upload: pkg
326326
ssh $(STAGINGSERVER) "mkdir -p staging/$(DISTTYPEDIR)/$(FULLVERSION)"
327-
scp -p iojs-$(FULLVERSION).pkg $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).pkg
328-
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).pkg.done"
327+
scp -p node-$(FULLVERSION).pkg $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).pkg
328+
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).pkg.done"
329329

330330
$(TARBALL): release-only $(NODE_EXE) doc
331331
git checkout-index -a -f --prefix=$(TARNAME)/
332332
mkdir -p $(TARNAME)/doc/api
333-
cp doc/iojs.1 $(TARNAME)/doc/iojs.1
333+
cp doc/node.1 $(TARNAME)/doc/node.1
334334
cp -r out/doc/api/* $(TARNAME)/doc/api/
335335
rm -rf $(TARNAME)/deps/v8/{test,samples,tools/profviz} # too big
336336
rm -rf $(TARNAME)/doc/images # too big
@@ -350,11 +350,11 @@ tar: $(TARBALL)
350350

351351
tar-upload: tar
352352
ssh $(STAGINGSERVER) "mkdir -p staging/$(DISTTYPEDIR)/$(FULLVERSION)"
353-
scp -p iojs-$(FULLVERSION).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.gz
354-
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.gz.done"
353+
scp -p node-$(FULLVERSION).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.gz
354+
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.gz.done"
355355
ifeq ($(XZ), 0)
356-
scp -p iojs-$(FULLVERSION).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.xz
357-
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION).tar.xz.done"
356+
scp -p node-$(FULLVERSION).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.xz
357+
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION).tar.xz.done"
358358
endif
359359

360360
doc-upload: tar
@@ -415,11 +415,11 @@ binary: $(BINARYTAR)
415415

416416
binary-upload: binary
417417
ssh $(STAGINGSERVER) "mkdir -p staging/$(DISTTYPEDIR)/$(FULLVERSION)"
418-
scp -p iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz
419-
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz.done"
418+
scp -p node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz
419+
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.gz.done"
420420
ifeq ($(XZ), 0)
421-
scp -p iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz
422-
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz.done"
421+
scp -p node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz
422+
ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node-$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz.done"
423423
endif
424424

425425
haswrk=$(shell which wrk > /dev/null 2>&1; echo $$?)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.