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 <[email protected]>
Reviewed-By: João Reis <[email protected]>

Author: cjihrig

.gitignore

@@ -12,6 +12,8 @@ tmp/
 test/tmp*/
 iojs
 iojs_g
+node
+node_g
 *.swp
 .benchmark_reports
 /.project

BSDmakefile

@@ -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}
 

CHANGELOG.md

@@ -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.

COLLABORATOR_GUIDE.md

@@ -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 [email protected]:username/io.js.git
-$ cd io.js
-$ git remote add upstream git://github.com/nodejs/io.js.git
+$ git clone [email protected]: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

CONTRIBUTING.md

@@ -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

GOVERNANCE.md

@@ -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.
   """
 

LICENSE

@@ -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 $$?)