Skip to content

Commit

Permalink
Change io.js to node.js everywhere but ./doc/
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewdeandrade committed Jun 3, 2015
1 parent a44056e commit 7af3086
Show file tree
Hide file tree
Showing 51 changed files with 317 additions and 1,080 deletions.
2 changes: 1 addition & 1 deletion BSDmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# io.js ChangeLog
# Node.js ChangeLog

## 2015-05-07, Version 2.0.1, @rvagg

Expand Down
16 changes: 8 additions & 8 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# io.js Collaborator Guide
# Node.js Collaborator Guide

**Contents**

Expand All @@ -8,7 +8,7 @@
* Landing Pull Requests
- Technical HOWTO

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
Expand All @@ -19,24 +19,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.

Expand Down Expand Up @@ -132,7 +132,7 @@ $ git merge --ff-only origin/master
Apply external patches

```text
$ curl -L https://github.com/iojs/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
Expand Down Expand Up @@ -219,7 +219,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 your commit lives in or the 10 minute period
passes, consider the commit final.
28 changes: 14 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -23,13 +23,13 @@ This document will guide you through the contribution process.

### Step 1: Fork

Fork the project [on GitHub](https://github.com/iojs/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/iojs/io.js.git
$ git clone [email protected]:username/node.git
$ cd node
$ git remote add upstream git://github.com/nodejs/node.git
```

#### Which branch?
Expand All @@ -48,15 +48,15 @@ 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/iojs/io.js/issues/) or contact one of the
[project Collaborators](https://github.com/iojs/io.js/#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
[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=node.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.

Expand Down Expand Up @@ -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-streams2-transform.js
$ node ./test/parallel/test-streams2-transform.js
```


Expand All @@ -152,7 +152,7 @@ $ iojs ./test/parallel/test-streams2-transform.js
$ 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
Expand Down
12 changes: 6 additions & 6 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 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 Committee (TC)
which is responsible for high-level guidance of the project.

The TC has final authority over this project including:
Expand All @@ -15,16 +15,16 @@ The TC has final authority over this project including:
* 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
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
[README.md](./README.md#current-project-team-members).

## Collaborators

The [iojs/io.js](https://github.com/iojs/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.

Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:

"""
Expand All @@ -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:
"""
Expand Down Expand Up @@ -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.
"""

Expand Down
24 changes: 12 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ PREFIX ?= /usr/local
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)

# Default to verbose builds.
# To do quiet/pretty builds, run `make V=` to set V to an empty string,
Expand Down Expand Up @@ -208,7 +208,7 @@ ifdef NIGHTLY
TAG = nightly-$(NIGHTLY)
FULLVERSION=$(VERSION)-$(TAG)
endif
TARNAME=iojs-$(FULLVERSION)
TARNAME=node-$(FULLVERSION)
TARBALL=$(TARNAME).tar
BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
BINARYTAR=$(BINARYNAME).tar
Expand All @@ -217,9 +217,9 @@ XZ_COMPRESSION ?= 9
PKG=out/$(TARNAME).pkg
PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker

PKGSRC=iojs-$(DESTCPU)-$(RAWVER).tgz
PKGSRC=node-$(DESTCPU)-$(RAWVER).tgz
ifdef NIGHTLY
PKGSRC=iojs-$(DESTCPU)-$(RAWVER)-$(TAG).tgz
PKGSRC=node-$(DESTCPU)-$(RAWVER)-$(TAG).tgz
endif

dist: doc $(TARBALL) $(PKG)
Expand Down Expand Up @@ -259,13 +259,13 @@ $(PKG): release-only
$(PYTHON) ./configure --dest-cpu=x64 --tag=$(TAG)
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
lipo $(PKGDIR)/32/usr/local/bin/iojs \
$(PKGDIR)/usr/local/bin/iojs \
-output $(PKGDIR)/usr/local/bin/iojs-universal \
lipo $(PKGDIR)/32/usr/local/bin/node \
$(PKGDIR)/usr/local/bin/node \
-output $(PKGDIR)/usr/local/bin/node-universal \
-create
mv $(PKGDIR)/usr/local/bin/iojs-universal $(PKGDIR)/usr/local/bin/iojs
mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
rm -rf $(PKGDIR)/32
cat tools/osx-pkg.pmdoc/index.xml.tmpl | sed -e 's|__iojsversion__|'$(FULLVERSION)'|g' | sed -e 's|__npmversion__|'$(NPMVERSION)'|g' > tools/osx-pkg.pmdoc/index.xml
cat tools/osx-pkg.pmdoc/index.xml.tmpl | sed -e 's|__nodeversion__|'$(FULLVERSION)'|g' | sed -e 's|__npmversion__|'$(NPMVERSION)'|g' > tools/osx-pkg.pmdoc/index.xml
$(PACKAGEMAKER) \
--id "org.nodejs.Node" \
--doc tools/osx-pkg.pmdoc \
Expand All @@ -275,7 +275,7 @@ $(PKG): release-only
$(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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Foundation:
This project is operating with the oversight of the joint Node.js and io.js
core technical teams.

Note: The original io.js README.md is temporarily renamed to iojs_README.md.
Note: The original io.js README.md is temporarily renamed to node_README.md.
32 changes: 16 additions & 16 deletions ROADMAP.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# io.js Roadmap
# Node.js Roadmap

***This is a living document, it describes the policy and priorities as they exist today but can evolve over time.***

## Stability Policy

The most important consideration in every code change is the impact it will have, positive or negative, on the ecosystem (modules and applications).

io.js does not remove stdlib JS API.
Node.js does not remove stdlib JS API.

Shipping with current and well supported dependencies is the best way to ensure long term stability of the platform. When those dependencies are no longer maintained io.js will take on their continued maintenance as part of our [Long Term Support policy](#long-term-support).
Shipping with current and well supported dependencies is the best way to ensure long term stability of the platform. When those dependencies are no longer maintained Node.js will take on their continued maintenance as part of our [Long Term Support policy](#long-term-support).

io.js will continue to adopt new V8 releases.
Node.js will continue to adopt new V8 releases.
* When V8 ships a breaking change to their C++ API that can be handled by [`nan`](https://github.com/rvagg/nan)
the *minor* version of io.js will be increased.
the *minor* version of Node.js will be increased.
* When V8 ships a breaking change to their C++ API that can NOT be handled by [`nan`](https://github.com/rvagg/nan)
the *major* version of io.js will be increased.
the *major* version of Node.js will be increased.
* When new features in the JavaScript language are introduced by V8 the
*minor* version number will be increased. TC39 has stated clearly that no
backwards incompatible changes will be made to the language so it is
Expand All @@ -26,42 +26,42 @@ Any API addition will cause an increase in the *minor* version.

### Long Term Support

io.js supports old versions for as long as community members are fixing bugs in them.
Node.js supports old versions for as long as community members are fixing bugs in them.

As long as there is a community back porting bug fixes we will push patch releases for those versions of io.js.
As long as there is a community back porting bug fixes we will push patch releases for those versions of Node.js.

When old versions of dependencies like V8 are no longer supported by their project io.js will take on the responsibility of maintenance to ensure continued long term support in io.js patch releases.
When old versions of dependencies like V8 are no longer supported by their project Node.js will take on the responsibility of maintenance to ensure continued long term support in Node.js patch releases.

## Channels

Channels are points of collaboration with the broader community and are not strictly scoped to a repository or branch.

* Release - Stable production ready builds. Unique version numbers following semver.
* Canary - Nightly builds w/ V8 version in Chrome Canary + changes landing to io.js. No version designation.
* Canary - Nightly builds w/ V8 version in Chrome Canary + changes landing to Node.js. No version designation.
* NG - "Next Generation." No version designation.

## NG (Next Generation)

In order for io.js to stay competitive we need to work on the next generation of the platform which will more accurately integrate and reflect the advancements in the language and the ecosystem.
In order for Node.js to stay competitive we need to work on the next generation of the platform which will more accurately integrate and reflect the advancements in the language and the ecosystem.

While this constitutes a great leap forward for the platform we will be making this leap without breaking backwards compatibility with the existing ecosystem of modules.

# Immediate Priorities

## Debugging and Tracing

Debugging is one of the first things from everyone's mouth, both developer and enterprise, when describing trouble they've had with node.js/io.js.
Debugging is one of the first things from everyone's mouth, both developer and enterprise, when describing trouble they've had with Node.js.

The goal of io.js' effort is to build a healthy debugging and tracing ecosystem and not to try and build any "silver bullet" features for core (like the domains debacle).
The goal of Node.js' effort is to build a healthy debugging and tracing ecosystem and not to try and build any "silver bullet" features for core (like the domains debacle).

The [Tracing WG](https://github.com/iojs/tracing-wg) is driving this effort:
The [Tracing WG](https://github.com/nodejs/tracing-wg) is driving this effort:

* AsyncWrap improvements - basically just iterations based on feedback from people using it.
* async-listener - userland module that will dogfood AsyncWrap as well as provide many often requested debugging features.
* Tracing
* Add tracing support for more platforms (LTTng, etc).
* [Unify the Tracing endpoint](https://github.com/iojs/io.js/issues/729).
* New Chrome Debugger - Google is working on a version of Chrome's debugger that is without Chrome and can be used with io.js.
* [Unify the Tracing endpoint](https://github.com/nodejs/node/issues/729).
* New Chrome Debugger - Google is working on a version of Chrome's debugger that is without Chrome and can be used with Node.js.

## Ecosystem Automation

Expand Down
Loading

0 comments on commit 7af3086

Please sign in to comment.