diff --git a/BSDmakefile b/BSDmakefile index fa0b4a9b8..699e2921f 100644 --- a/BSDmakefile +++ b/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} diff --git a/CHANGELOG.md b/CHANGELOG.md index 36e615425..7876f04e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# io.js ChangeLog +# Node.js ChangeLog ## 2015-05-07, Version 2.0.1, @rvagg diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 792dbf3d4..747549ccc 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -1,4 +1,4 @@ -# io.js Collaborator Guide +# Node.js Collaborator Guide **Contents** @@ -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 @@ -19,7 +19,7 @@ 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 @@ -27,16 +27,16 @@ 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. @@ -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 @@ -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. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2edd60a0..0e5c79312 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.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/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 git@github.com:username/io.js.git -$ cd io.js -$ git remote add upstream git://github.com/iojs/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,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. @@ -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 ``` @@ -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 diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 13fa6bca9..5251b3f3d 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -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: @@ -15,8 +15,8 @@ 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 @@ -24,7 +24,7 @@ For the current list of TC members, see the project ## 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. @@ -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 diff --git a/LICENSE b/LICENSE index f493fde36..6fc9b4209 100644 --- a/LICENSE +++ b/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. """ diff --git a/Makefile b/Makefile index 451f81dde..17a1f7cb0 100644 --- a/Makefile +++ b/Makefile @@ -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, @@ -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 @@ -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) @@ -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 \ @@ -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 diff --git a/README.md b/README.md index 02c3112fb..7281fbbb6 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/ROADMAP.md b/ROADMAP.md index 9e56f4956..51b87ae62 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,4 +1,4 @@ -# 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.*** @@ -6,15 +6,15 @@ 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 @@ -26,23 +26,23 @@ 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. @@ -50,18 +50,18 @@ While this constitutes a great leap forward for the platform we will be making t ## 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 diff --git a/WORKING_GROUPS.md b/WORKING_GROUPS.md index 55aafd02a..2594d2734 100644 --- a/WORKING_GROUPS.md +++ b/WORKING_GROUPS.md @@ -1,7 +1,7 @@ -# io.js Working Groups +# Node.js Working Groups -io.js Working Groups are autonomous projects created by the -[Technical Committee (TC)](https://github.com/iojs/io.js/blob/master/GOVERNANCE.md#technical-committee). +Node.js Working Groups are autonomous projects created by the +[Technical Committee (TC)](https://github.com/nodejs/node/blob/master/GOVERNANCE.md#technical-committee). Working Groups can be formed at any time but must be ratified by the TC. Once formed the work defined in the Working Group charter is the @@ -30,37 +30,37 @@ back in to the TC. * [Starting a Working Group](#starting-a-wg) * [Bootstrap Governance](#bootstrap-governance) -### [Website](https://github.com/iojs/website) +### [Website](https://github.com/nodejs/website) The website working group's purpose is to build and maintain a public -website for the `io.js` project. +website for the `Node.js` project. Its responsibilities are: -* Develop and maintain a build and automation system for `iojs.org`. -* Ensure the site is regularly updated with changes made to `io.js` like +* Develop and maintain a build and automation system for `nodejs.org`. +* Ensure the site is regularly updated with changes made to `Node.js` like releases and features. * Foster and enable a community of translators. -### [Streams](https://github.com/iojs/readable-stream) +### [Streams](https://github.com/nodejs/readable-stream) The Streams WG is dedicated to the support and improvement of the Streams API -as used in io.js and the npm ecosystem. We seek to create a composable API that +as used in Node.js and the npm ecosystem. We seek to create a composable API that solves the problem of representing multiple occurrences of an event over time in a humane, low-overhead fashion. Improvements to the API will be driven by the needs of the ecosystem; interoperability and backwards compatibility with other solutions and prior versions are paramount in importance. Our responsibilities include: -* Addressing stream issues on the io.js issue tracker. -* Authoring and editing stream documentation within the io.js project. -* Reviewing changes to stream subclasses within the io.js project. -* Redirecting changes to streams from the io.js project to this project. -* Assisting in the implementation of stream providers within io.js. -* Recommending versions of readable-stream to be included in io.js. +* Addressing stream issues on the Node.js issue tracker. +* Authoring and editing stream documentation within the Node.js project. +* Reviewing changes to stream subclasses within the Node.js project. +* Redirecting changes to streams from the Node.js project to this project. +* Assisting in the implementation of stream providers within Node.js. +* Recommending versions of readable-stream to be included in Node.js. * Messaging about the future of streams to give the community advance notice of changes. -### [Build](https://github.com/iojs/build) +### [Build](https://github.com/nodejs/build) The build working group's purpose is to create and maintain a distributed automation infrastructure. @@ -72,10 +72,10 @@ Its responsibilities are: * Creates and manages build-containers. -### [Tracing](https://github.com/iojs/tracing-wg) +### [Tracing](https://github.com/nodejs/tracing-wg) The tracing working group's purpose is to increase the -transparency of software written in io.js. +transparency of software written in Node.js. Its responsibilities are: * Collaboration with V8 to integrate with `trace_event`. @@ -95,56 +95,56 @@ language community might then produce multiple localizations for various project resources. Their responsibilities are: -* Translations of any io.js materials they believe are relevant to their +* Translations of any Node.js materials they believe are relevant to their community. * Review processes for keeping translations up to date and of high quality. * Social media channels in their language. -* Promotion of io.js speakers for meetups and conferences in their +* Promotion of Node.js speakers for meetups and conferences in their language. Each language community maintains its own membership. -* [iojs-ar - Arabic (اللغة العربية)](http://github.com/iojs/iojs-ar) -* [iojs-bg - Bulgarian (български език)](http://github.com/iojs/iojs-bg) -* [iojs-bn - Bengali (বাংলা)](http://github.com/iojs/iojs-bn) -* [iojs-cn - Chinese (中文)](http://github.com/iojs/iojs-cn) -* [iojs-cs - Czech (Český Jazyk)](http://github.com/iojs/iojs-cs) -* [iojs-da - Danish (Dansk)](http://github.com/iojs/iojs-da) -* [iojs-de - German (Deutsch)](http://github.com/iojs/iojs-de) -* [iojs-el - Greek (Ελληνικά)](http://github.com/iojs/iojs-el) -* [iojs-es - Spanish (Español)](http://github.com/iojs/iojs-es) -* [iojs-fa - Persian (فارسی)](http://github.com/iojs/iojs-fa) -* [iojs-fi - Finnish (Suomi)](http://github.com/iojs/iojs-fi) -* [iojs-fr - French (Français)](http://github.com/iojs/iojs-fr) -* [iojs-he - Hebrew (עברית)](http://github.com/iojs/iojs-he) -* [iojs-hi - Hindi (फिजी बात)](http://github.com/iojs/iojs-hi) -* [iojs-hu - Hungarian (Magyar)](http://github.com/iojs/iojs-hu) -* [iojs-id - Indonesian (Bahasa Indonesia)](http://github.com/iojs/iojs-id) -* [iojs-it - Italian (Italiano)](http://github.com/iojs/iojs-it) -* [iojs-ja - Japanese (日本語)](http://github.com/iojs/iojs-ja) -* [iojs-ka - Georgian (ქართული)](http://github.com/iojs/iojs-ka) -* [iojs-ko - Korean (조선말)](http://github.com/iojs/iojs-ko) -* [iojs-mk - Macedonian (Mакедонски)](http://github.com/iojs/iojs-mk) -* [iojs-ms - Malay (بهاس ملايو)](http://github.com/iojs/iojs-ms) -* [iojs-nl - Dutch (Nederlands)](http://github.com/iojs/iojs-nl) -* [iojs-no - Norwegian (Norsk)](http://github.com/iojs/iojs-no) -* [iojs-pl - Polish (Język Polski)](http://github.com/iojs/iojs-pl) -* [iojs-pt - Portuguese (Português)](http://github.com/iojs/iojs-pt) -* [iojs-ro - Romanian (Română)](http://github.com/iojs/iojs-ro) -* [iojs-ru - Russian (Русский)](http://github.com/iojs/iojs-ru) -* [iojs-sv - Swedish (Svenska)](http://github.com/iojs/iojs-sv) -* [iojs-ta - Tamil (தமிழ்)](http://github.com/iojs/iojs-ta) -* [iojs-tr - Turkish (Türkçe)](http://github.com/iojs/iojs-tr) -* [iojs-tw - Taiwanese (Hō-ló)](http://github.com/iojs/iojs-tw) -* [iojs-uk - Ukrainian (Українська)](http://github.com/iojs/iojs-uk) -* [iojs-vi - Vietnamese (Tiếng Việtnam)](http://github.com/iojs/iojs-vi) - - -### [Evangelism](https://github.com/iojs/evangelism) +* [iojs-ar - Arabic (اللغة العربية)](http://github.com/nodejs/iojs-ar) +* [iojs-bg - Bulgarian (български език)](http://github.com/nodejs/iojs-bg) +* [iojs-bn - Bengali (বাংলা)](http://github.com/nodejs/iojs-bn) +* [iojs-cn - Chinese (中文)](http://github.com/nodejs/iojs-cn) +* [iojs-cs - Czech (Český Jazyk)](http://github.com/nodejs/iojs-cs) +* [iojs-da - Danish (Dansk)](http://github.com/nodejs/iojs-da) +* [iojs-de - German (Deutsch)](http://github.com/nodejs/iojs-de) +* [iojs-el - Greek (Ελληνικά)](http://github.com/nodejs/iojs-el) +* [iojs-es - Spanish (Español)](http://github.com/nodejs/iojs-es) +* [iojs-fa - Persian (فارسی)](http://github.com/nodejs/iojs-fa) +* [iojs-fi - Finnish (Suomi)](http://github.com/nodejs/iojs-fi) +* [iojs-fr - French (Français)](http://github.com/nodejs/iojs-fr) +* [iojs-he - Hebrew (עברית)](http://github.com/nodejs/iojs-he) +* [iojs-hi - Hindi (फिजी बात)](http://github.com/nodejs/iojs-hi) +* [iojs-hu - Hungarian (Magyar)](http://github.com/nodejs/iojs-hu) +* [iojs-id - Indonesian (Bahasa Indonesia)](http://github.com/nodejs/iojs-id) +* [iojs-it - Italian (Italiano)](http://github.com/nodejs/iojs-it) +* [iojs-ja - Japanese (日本語)](http://github.com/nodejs/iojs-ja) +* [iojs-ka - Georgian (ქართული)](http://github.com/nodejs/iojs-ka) +* [iojs-ko - Korean (조선말)](http://github.com/nodejs/iojs-ko) +* [iojs-mk - Macedonian (Mакедонски)](http://github.com/nodejs/iojs-mk) +* [iojs-ms - Malay (بهاس ملايو)](http://github.com/nodejs/iojs-ms) +* [iojs-nl - Dutch (Nederlands)](http://github.com/nodejs/iojs-nl) +* [iojs-no - Norwegian (Norsk)](http://github.com/nodejs/iojs-no) +* [iojs-pl - Polish (Język Polski)](http://github.com/nodejs/iojs-pl) +* [iojs-pt - Portuguese (Português)](http://github.com/nodejs/iojs-pt) +* [iojs-ro - Romanian (Română)](http://github.com/nodejs/iojs-ro) +* [iojs-ru - Russian (Русский)](http://github.com/nodejs/iojs-ru) +* [iojs-sv - Swedish (Svenska)](http://github.com/nodejs/iojs-sv) +* [iojs-ta - Tamil (தமிழ்)](http://github.com/nodejs/iojs-ta) +* [iojs-tr - Turkish (Türkçe)](http://github.com/nodejs/iojs-tr) +* [iojs-tw - Taiwanese (Hō-ló)](http://github.com/nodejs/iojs-tw) +* [iojs-uk - Ukrainian (Українська)](http://github.com/nodejs/iojs-uk) +* [iojs-vi - Vietnamese (Tiếng Việtnam)](http://github.com/nodejs/iojs-vi) + + +### [Evangelism](https://github.com/nodejs/evangelism) The evangelism working group promotes the accomplishments -of io.js and lets the community know how they can get involved. +of Node.js and lets the community know how they can get involved. Their responsibilities are: * Project messaging. @@ -155,10 +155,10 @@ Their responsibilities are: content. -### [Roadmap](https://github.com/iojs/roadmap) +### [Roadmap](https://github.com/nodejs/roadmap) The roadmap working group is responsible for user community outreach -and the translation of their concerns into a plan of action for io.js. +and the translation of their concerns into a plan of action for Node.js. The final [ROADMAP](./ROADMAP.md) document is still owned by the TC and requires the same approval for changes as any other project asset. @@ -169,41 +169,41 @@ Their responsibilities are: * Create Pull Requests for relevant changes to [Roadmap.md](./ROADMAP.md) -### [Docker](https://github.com/iojs/docker-iojs) +### [Docker](https://github.com/nodejs/docker-iojs) The Docker working group's purpose is to build, maintain, and improve official -Docker images for the `io.js` project. +Docker images for the `Node.js` project. Their responsibilities are: -* Keep the official Docker images updated in line with new `io.js` releases. +* Keep the official Docker images updated in line with new `Node.js` releases. * Decide and implement image improvements and/or fixes. * Maintain and improve the images' documentation. -### [Addon API](https://github.com/iojs/nan) +### [Addon API](https://github.com/nodejs/nan) The Addon API Working Group is responsible for maintaining the NAN project and corresponding _nan_ package in npm. The NAN project makes available an -abstraction layer for native add-on authors for both Node.js and io.js, -assisting in the writing of code that is compatible with many actively used -versions of Node.js, io.js, V8 and libuv. +abstraction layer for native add-on authors for Node.js, assisting in the +writing of code that is compatible with many actively used versions of Node.js, +V8 and libuv. Their responsibilities are: -* Maintaining the [NAN](https://github.com/iojs/nan) GitHub repository, +* Maintaining the [NAN](https://github.com/nodejs/nan) GitHub repository, including code, issues and documentation. -* Maintaining the [addon-examples](https://github.com/iojs/node-addon-examples) +* Maintaining the [addon-examples](https://github.com/nodejs/node-addon-examples) GitHub repository, including code, issues and documentation. -* Maintaining the C++ Addon API within the io.js project, in subordination to - the io.js TC. -* Maintaining the Addon documentation within the io.js project, in - subordination to the io.js TC. +* Maintaining the C++ Addon API within the Node.js project, in subordination to + the Node.js TC. +* Maintaining the Addon documentation within the Node.js project, in + subordination to the Node.js TC. * Maintaining the _nan_ package in npm, releasing new versions as appropriate. -* Messaging about the future of the io.js and NAN interface to give the +* Messaging about the future of the Node.js and NAN interface to give the community advance notice of changes. The current members can be found in their -[README](https://github.com/iojs/nan#collaborators). +[README](https://github.com/nodejs/nan#collaborators). ## Starting a WG @@ -239,7 +239,7 @@ governance process, hence the term "bootstrap." ### *[insert WG name]* Working Group -The io.js *[insert WG name]* is jointly governed by a Working Group (WG) +The Node.js *[insert WG name]* is jointly governed by a Working Group (WG) that is responsible for high-level guidance of the project. The WG has final authority over this project including: diff --git a/benchmark/README.md b/benchmark/README.md index dc6f53fbe..cbb57c693 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -1,7 +1,7 @@ -# io.js core benchmark tests +# Node.js core benchmark tests This folder contains benchmark tests to measure the performance for certain -io.js APIs. +Node.js APIs. ## Prerequisites @@ -18,7 +18,7 @@ There are two ways to run benchmark tests: 1. Run all tests of a given type, for example, buffers ```sh -iojs benchmark/common.js buffers +node benchmark/common.js buffers ``` The above command will find all scripts under `buffers` directory and require @@ -78,7 +78,7 @@ buffers/buffer-read.js noAssert=false buffer=fast type=UInt16BE millions=1: 244. 2. Run an individual test, for example, buffer-slice.js ```sh -iojs benchmark/buffers/buffer-read.js +node benchmark/buffers/buffer-read.js ``` The output: ``` @@ -95,7 +95,7 @@ This example will run only the first type of url test, with one iteration. ```sh -iojs benchmark/url/url-parse.js type=one n=1 +node benchmark/url/url-parse.js type=one n=1 ``` Output: ``` diff --git a/benchmark/common.js b/benchmark/common.js index c7961e565..158354004 100644 --- a/benchmark/common.js +++ b/benchmark/common.js @@ -19,7 +19,7 @@ if (module === require.main) { var type = process.argv[2]; var testFilter = process.argv[3]; if (!type) { - console.error('usage:\n ./iojs benchmark/common.js [testFilter]'); + console.error('usage:\n ./node benchmark/common.js [testFilter]'); process.exit(1); } diff --git a/benchmark/http-flamegraph.sh b/benchmark/http-flamegraph.sh index 5dc41b541..7df0c1575 100644 --- a/benchmark/http-flamegraph.sh +++ b/benchmark/http-flamegraph.sh @@ -1,7 +1,7 @@ #!/bin/bash cd "$(dirname "$(dirname $0)")" -node=${NODE:-./iojs} +node=${NODE:-./node} name=${NAME:-stacks} @@ -22,7 +22,7 @@ fi ulimit -n 100000 $node benchmark/http_simple.js & nodepid=$! -echo "iojs pid = $nodepid" +echo "node pid = $nodepid" sleep 1 # has to stay alive until dtrace exits @@ -62,7 +62,7 @@ echo 'Turn the stacks into a svg' stackvis dtrace flamegraph-svg < "$name".src > "$name".raw.svg echo 'Prune tiny stacks out of the graph' -iojs -e ' +node -e ' var infile = process.argv[1]; var outfile = process.argv[2]; var output = ""; diff --git a/benchmark/http.sh b/benchmark/http.sh index 63fc02e97..9a844a900 100755 --- a/benchmark/http.sh +++ b/benchmark/http.sh @@ -24,7 +24,7 @@ if [ "$k" = "no" ]; then else k="-k" fi -node=${NODE:-./iojs} +node=${NODE:-./node} $node benchmark/http_simple.js & npid=$! diff --git a/benchmark/http_simple_bench.sh b/benchmark/http_simple_bench.sh index 2066047b9..694822797 100755 --- a/benchmark/http_simple_bench.sh +++ b/benchmark/http_simple_bench.sh @@ -14,7 +14,7 @@ if [ ! -d benchmark/ ]; then fi if [ $SERVER == "127.0.0.1" ]; then - ./iojs benchmark/http_simple.js & + ./node benchmark/http_simple.js & node_pid=$! sleep 1 fi diff --git a/benchmark/plot.R b/benchmark/plot.R index 288e8bd5a..1f902eddf 100755 --- a/benchmark/plot.R +++ b/benchmark/plot.R @@ -52,7 +52,7 @@ ab.load <- function (filename, name) { filename <- args[0:1] -data <- ab.load(filename, "iojs") +data <- ab.load(filename, "node") # histogram diff --git a/benchmark/plot_csv.R b/benchmark/plot_csv.R index 20ab033ef..796097588 100755 --- a/benchmark/plot_csv.R +++ b/benchmark/plot_csv.R @@ -5,7 +5,7 @@ # # Once installed, you can generate some CSV output with a command like this: # -# $ OUTPUT_FORMAT=csv iojs benchmark/http/client-request-body.js > data.csv +# $ OUTPUT_FORMAT=csv node benchmark/http/client-request-body.js > data.csv # $ ./benchmark/plot_csv.R data.csv data.png bytes type # # Where the 3rd argument to this script is the graph's X coordinate, the 4th is diff --git a/configure b/configure index 49613ef00..5ff331f36 100755 --- a/configure +++ b/configure @@ -39,7 +39,7 @@ shared_optgroup = optparse.OptionGroup(parser, "Shared libraries", "built-in dependencies or its shared representations. If necessary, " "provide multiple libraries with comma.") intl_optgroup = optparse.OptionGroup(parser, "Internationalization", - "Flags that lets you enable i18n features in io.js as well as which " + "Flags that lets you enable i18n features in Node.js as well as which " "library you want to build against.") # Options should be in alphabetical order but keep --prefix at the top, @@ -385,7 +385,7 @@ def get_llvm_version(cc): proc = subprocess.Popen(shlex.split(cc) + ['-v'], stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE) except OSError: - print '''io.js configure error: No acceptable C compiler found! + print '''Node.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed @@ -410,7 +410,7 @@ def get_gas_version(cc): stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE) except OSError: - print '''io.js configure error: No acceptable C compiler found! + print '''Node.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed @@ -468,7 +468,7 @@ def cc_macros(): stdout=subprocess.PIPE, stderr=subprocess.PIPE) except OSError: - print '''io.js configure error: No acceptable C compiler found! + print '''Node.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 02f926e73..345b8e11f 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -9,7 +9,7 @@ linux-x86_64 solaris-x86-gcc solaris64-x86_64-gcc CFG = opensslconf.h SRC_CFG = ../openssl/crypto/$(CFG) BACKUP_FILES = ../openssl/Makefile ../openssl/Makefile.bak $(SRC_CFG) -BACKUP_EXT = iojsbackup +BACKUP_EXT = nodebackup # OPENSSL_CPUID_OBJ is defined in openssl.gypi for use --openssl-no-asm CPUIDFIX = 's/\#define OPENSSL_CPUID_OBJ$$//;' @@ -28,7 +28,7 @@ $(ARCHS): # The current openssl release does not use RC4 asm since it explicitly # specified as `$asm=~s/rc4\-[^:]+//;` in # https://github.com/openssl/openssl/blob/OpenSSL_1_0_1-stable/Configure#L584 -# But iojs has used RC4 asm on MacOS for long time. Fix type of RC4_INT +# But node has used RC4 asm on MacOS for long time. Fix type of RC4_INT # into `unsigned int` in opensslconf.h of darwin64-x86_64-cc to work on # the RC4 asm. fixdarwin64: diff --git a/deps/openssl/config/opensslconf.h b/deps/openssl/config/opensslconf.h index 76efd0863..c27e8a47d 100644 --- a/deps/openssl/config/opensslconf.h +++ b/deps/openssl/config/opensslconf.h @@ -3,7 +3,7 @@ specifying a target argument, where it includes several defines that depend on OS and architecture platform. - In iojs, we statically mapped --dest-os and --dest-cpu options in + In node, we statically mapped --dest-os and --dest-cpu options in configure to the target of Configure in OpenSSL and make `deps/openssl/conf/openssconf.h` so as to include each file according to its target by checking pre-defined compiler macros. @@ -11,9 +11,9 @@ Included opnesslconf.h files for supported target architectures can be generated by `Makefile` and stored under `archs/{target}/opensslconf.h`. The Makefile also fixes several - defines to meet iojs build requirements. + defines to meet node build requirements. - Here is a map table of configure options in iojs, target arch of + Here is a map table of configure options in node, target arch of Configure in OpenSSL and CI support. | --dest-os | --dest-cpu | OpenSSL target arch | CI | diff --git a/deps/openssl/doc/UPGRADING.md b/deps/openssl/doc/UPGRADING.md index 81f129c43..2f8d5b4a3 100644 --- a/deps/openssl/doc/UPGRADING.md +++ b/deps/openssl/doc/UPGRADING.md @@ -1,7 +1,7 @@ -## How to upgrade openssl library in io.js +## How to upgrade openssl library in Node.js This document describes the procedure to upgrade openssl from 1.0.1m -to 1.0.2a in io.js. +to 1.0.2a in Node.js. ### Build System and Upgrading Overview @@ -17,16 +17,16 @@ hardware performance according to the type of cpus. `Configure TABLE` shows various build parameters that depend on each os and arch. -In io.js, build target is defined as `--dest-os` and `--dest-cpu` in +In Node.js, build target is defined as `--dest-os` and `--dest-cpu` in configure options which are different from the one that is defined in openssl and it's build system is gyp that is based on python, therefore we cannot use the openssl build system directly. -In order to build openssl with gyp in iojs, files of opensslconf.h and +In order to build openssl with gyp in node, files of opensslconf.h and asm are generated in advance for several supported platforms. Here is a map table to show conf(opensslconf.h) and asm between -the openssl target and configuration parameters of os and cpu in iojs. +the openssl target and configuration parameters of os and cpu in node. The tested platform in CI are also listed. | --dest-os | --dest-cpu | conf | asm | openssl target | CI | @@ -74,7 +74,7 @@ build. Furthermore, these perl scripts check the version of assembler and generate asm files according to the supported instructions in each compiler. -Since perl is not a build requirement in iojs, they all should be +Since perl is not a build requirement in node, they all should be generated in advance and statically stored in the repository. We provide two sets of asm files, one is asm_latest(avx2 and addx supported) in `deps/openssl/asm` and the other asm_obsolete(without @@ -91,7 +91,7 @@ https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/crypto/sha/asm/sha5 otherwise asm_obsolete are used. The following is the detail instruction steps how to upgrade openssl -version from 1.0.1m to 1.0.2a in iojs. +version from 1.0.1m to 1.0.2a in node. ### 1. Replace openssl source in `deps/openssl/openssl` Remove old openssl sources in `deps/openssl/openssl` . @@ -104,18 +104,18 @@ There are three kinds of private patches to be applied in openssl-1.0.2a. - The two fixes of assembly error on ia32 win32. masm is no longer supported in openssl. We should move to use nasm or yasm in future - version of iojs. + version of node. - The fix of openssl-cli built on win. Key press requirement of openssl-cli in win causes timeout failures of several tests. - Backport patches for alt cert feature from openssl-1.1.x. Root certs - of 1024bit RSA key length were deprecated in io.js. When a tls - server has a cross root cert, io.js client leads CERT_UNTRUSTED + of 1024bit RSA key length were deprecated in Node.js. When a tls + server has a cross root cert, Node.js client leads CERT_UNTRUSTED error because openssl does not find alternate cert chains. This fix supports its feature but was made the current master which is openssl-1.1.x. We backported them privately into openssl-1.0.2 on - iojs. + node. ### 3. Replace openssl header files in `deps/openssl/openssl/include/openssl` all header files in `deps/openssl/openssl/include/openssl/*.h` are @@ -142,7 +142,7 @@ One fix of opensslconf.h is needed in 64-bit MacOS. The current openssl release does not use RC4 asm since it explicitly specified as `$asm=~s/rc4\-[^:]+//;` in https://github.com/openssl/openssl/blob/OpenSSL_1_0_1-stable/Configure#L584 -But iojs has used RC4 asm on MacOS for long time. Fix type of RC4_INT +But node has used RC4 asm on MacOS for long time. Fix type of RC4_INT into `unsigned int` in opensslconf.h of darwin64-x86_64-cc to work on the RC4 asm. @@ -154,7 +154,7 @@ be obtained via `Configure TABLE`. Its list is put in the table of There is no way to verify all necessary sources automatically. We can only carefully look at the source list and compiled objects in Makefile of openssl and compare the compiled objects that stored -stored under `out/Release/obj.target/openssl/deps/openssl/' in iojs. +stored under `out/Release/obj.target/openssl/deps/openssl/' in node. ### 6. ASM files for openssl We provide two sets of asm files. One is for the latest assembler diff --git a/doc/iojs.1 b/doc/iojs.1 deleted file mode 100644 index 8a94af35d..000000000 --- a/doc/iojs.1 +++ /dev/null @@ -1,731 +0,0 @@ -.TH IO.JS "1" "2010" "" "" - - -.SH "NAME" -iojs \- Server-side JavaScript - -.SH SYNOPSIS - - -.B iojs -[ -.B \-v -] -[ -.B \-\-debug -| -.B \-\-debug-brk -] -[ -.B \-\-v8-options -] -.br - [ -.B \-e -.I command -| -.I script.js -] -[ -.I arguments -] - -Execute without arguments to start the REPL. - - -.SH DESCRIPTION - -io.js is a set of libraries for javascript which allows -it to be used outside of the browser. It is primarily -focused on creating simple, easy to build network clients -and servers. - - -.SH OPTIONS - - -v, --version print iojs's version - - -e, --eval script evaluate script - - -p, --print print result of --eval - - -i, --interactive always enter the REPL even if stdin - does not appear to be a terminal - - -r, --require module to preload at startup - - --no-deprecation silence deprecation warnings - - --trace-deprecation show stack traces on deprecations - - --throw-deprecation throw errors on deprecations - - --v8-options print v8 command line options - - -.SH ENVIRONMENT VARIABLES - -.IP NODE_PATH -\':\'\-separated list of directories prefixed to the module search path. - -.IP NODE_DISABLE_COLORS -If set to 1 then colors will not be used in the REPL. - -.SH V8 OPTIONS - - --use_strict (enforce strict mode) - type: bool default: false - --es_staging (enable all completed harmony features) - type: bool default: false - --harmony (enable all completed harmony features) - type: bool default: false - --harmony_shipping (enable all shipped harmony features) - type: bool default: true - --harmony_modules (enable "harmony modules (implies block scoping)" (in progress)) - type: bool default: false - --harmony_arrays (enable "harmony array methods" (in progress)) - type: bool default: false - --harmony_array_includes (enable "harmony Array.prototype.includes" (in progress)) - type: bool default: false - --harmony_regexps (enable "harmony regular expression extensions" (in progress)) - type: bool default: false - --harmony_arrow_functions (enable "harmony arrow functions" (in progress)) - type: bool default: false - --harmony_proxies (enable "harmony proxies" (in progress)) - type: bool default: false - --harmony_sloppy (enable "harmony features in sloppy mode" (in progress)) - type: bool default: false - --harmony_unicode (enable "harmony unicode escapes" (in progress)) - type: bool default: false - --harmony_tostring (enable "harmony toString") - type: bool default: false - --harmony_numeric_literals (enable "harmony numeric literals") - type: bool default: true - --harmony_strings (enable "harmony string methods") - type: bool default: true - --harmony_scoping (enable "harmony block scoping") - type: bool default: true - --harmony_classes (enable "harmony classes (implies block scoping & object literal extension)") - type: bool default: true - --harmony_object_literals (enable "harmony object literal extensions") - type: bool default: true - --harmony_templates (enable "harmony template literals") - type: bool default: true - --compiled_keyed_generic_loads (use optimizing compiler to generate keyed generic load stubs) - type: bool default: false - --pretenuring_call_new (pretenure call new) - type: bool default: false - --allocation_site_pretenuring (pretenure with allocation sites) - type: bool default: true - --trace_pretenuring (trace pretenuring decisions of HAllocate instructions) - type: bool default: false - --trace_pretenuring_statistics (trace allocation site pretenuring statistics) - type: bool default: false - --track_fields (track fields with only smi values) - type: bool default: true - --track_double_fields (track fields with double values) - type: bool default: true - --track_heap_object_fields (track fields with heap values) - type: bool default: true - --track_computed_fields (track computed boilerplate fields) - type: bool default: true - --track_field_types (track field types) - type: bool default: true - --smi_binop (support smi representation in binary operations) - type: bool default: true - --vector_ics (support vector-based ics) - type: bool default: false - --optimize_for_size (Enables optimizations which favor memory size over execution speed.) - type: bool default: false - --unbox_double_arrays (automatically unbox arrays of doubles) - type: bool default: true - --string_slices (use string slices) - type: bool default: true - --crankshaft (use crankshaft) - type: bool default: true - --hydrogen_filter (optimization filter) - type: string default: * - --use_gvn (use hydrogen global value numbering) - type: bool default: true - --gvn_iterations (maximum number of GVN fix-point iterations) - type: int default: 3 - --use_canonicalizing (use hydrogen instruction canonicalizing) - type: bool default: true - --use_inlining (use function inlining) - type: bool default: true - --use_escape_analysis (use hydrogen escape analysis) - type: bool default: true - --use_allocation_folding (use allocation folding) - type: bool default: true - --use_local_allocation_folding (only fold in basic blocks) - type: bool default: false - --use_write_barrier_elimination (eliminate write barriers targeting allocations in optimized code) - type: bool default: true - --max_inlining_levels (maximum number of inlining levels) - type: int default: 5 - --max_inlined_source_size (maximum source size in bytes considered for a single inlining) - type: int default: 600 - --max_inlined_nodes (maximum number of AST nodes considered for a single inlining) - type: int default: 196 - --max_inlined_nodes_cumulative (maximum cumulative number of AST nodes considered for inlining) - type: int default: 400 - --loop_invariant_code_motion (loop invariant code motion) - type: bool default: true - --fast_math (faster (but maybe less accurate) math functions) - type: bool default: true - --collect_megamorphic_maps_from_stub_cache (crankshaft harvests type feedback from stub cache) - type: bool default: true - --hydrogen_stats (print statistics for hydrogen) - type: bool default: false - --trace_check_elimination (trace check elimination phase) - type: bool default: false - --trace_hydrogen (trace generated hydrogen to file) - type: bool default: false - --trace_hydrogen_filter (hydrogen tracing filter) - type: string default: * - --trace_hydrogen_stubs (trace generated hydrogen for stubs) - type: bool default: false - --trace_hydrogen_file (trace hydrogen to given file name) - type: string default: NULL - --trace_phase (trace generated IR for specified phases) - type: string default: HLZ - --trace_inlining (trace inlining decisions) - type: bool default: false - --trace_load_elimination (trace load elimination) - type: bool default: false - --trace_store_elimination (trace store elimination) - type: bool default: false - --trace_alloc (trace register allocator) - type: bool default: false - --trace_all_uses (trace all use positions) - type: bool default: false - --trace_range (trace range analysis) - type: bool default: false - --trace_gvn (trace global value numbering) - type: bool default: false - --trace_representation (trace representation types) - type: bool default: false - --trace_removable_simulates (trace removable simulates) - type: bool default: false - --trace_escape_analysis (trace hydrogen escape analysis) - type: bool default: false - --trace_allocation_folding (trace allocation folding) - type: bool default: false - --trace_track_allocation_sites (trace the tracking of allocation sites) - type: bool default: false - --trace_migration (trace object migration) - type: bool default: false - --trace_generalization (trace map generalization) - type: bool default: false - --stress_pointer_maps (pointer map for every instruction) - type: bool default: false - --stress_environments (environment for every instruction) - type: bool default: false - --deopt_every_n_times (deoptimize every n times a deopt point is passed) - type: int default: 0 - --deopt_every_n_garbage_collections (deoptimize every n garbage collections) - type: int default: 0 - --print_deopt_stress (print number of possible deopt points) - type: bool default: false - --trap_on_deopt (put a break point before deoptimizing) - type: bool default: false - --trap_on_stub_deopt (put a break point before deoptimizing a stub) - type: bool default: false - --deoptimize_uncommon_cases (deoptimize uncommon cases) - type: bool default: true - --polymorphic_inlining (polymorphic inlining) - type: bool default: true - --use_osr (use on-stack replacement) - type: bool default: true - --array_bounds_checks_elimination (perform array bounds checks elimination) - type: bool default: true - --trace_bce (trace array bounds check elimination) - type: bool default: false - --array_bounds_checks_hoisting (perform array bounds checks hoisting) - type: bool default: false - --array_index_dehoisting (perform array index dehoisting) - type: bool default: true - --analyze_environment_liveness (analyze liveness of environment slots and zap dead values) - type: bool default: true - --load_elimination (use load elimination) - type: bool default: true - --check_elimination (use check elimination) - type: bool default: true - --store_elimination (use store elimination) - type: bool default: false - --dead_code_elimination (use dead code elimination) - type: bool default: true - --fold_constants (use constant folding) - type: bool default: true - --trace_dead_code_elimination (trace dead code elimination) - type: bool default: false - --unreachable_code_elimination (eliminate unreachable code) - type: bool default: true - --trace_osr (trace on-stack replacement) - type: bool default: false - --stress_runs (number of stress runs) - type: int default: 0 - --lookup_sample_by_shared (when picking a function to optimize, watch for shared function info, not JSFunction itself) - type: bool default: true - --cache_optimized_code (cache optimized code for closures) - type: bool default: true - --flush_optimized_code_cache (flushes the cache of optimized code for closures on every GC) - type: bool default: true - --inline_construct (inline constructor calls) - type: bool default: true - --inline_arguments (inline functions with arguments object) - type: bool default: true - --inline_accessors (inline JavaScript accessors) - type: bool default: true - --escape_analysis_iterations (maximum number of escape analysis fix-point iterations) - type: int default: 2 - --optimize_for_in (optimize functions containing for-in loops) - type: bool default: true - --concurrent_recompilation (optimizing hot functions asynchronously on a separate thread) - type: bool default: true - --job_based_recompilation (post tasks to v8::Platform instead of using a thread for concurrent recompilation) - type: bool default: false - --trace_concurrent_recompilation (track concurrent recompilation) - type: bool default: false - --concurrent_recompilation_queue_length (the length of the concurrent compilation queue) - type: int default: 8 - --concurrent_recompilation_delay (artificial compilation delay in ms) - type: int default: 0 - --block_concurrent_recompilation (block queued jobs until released) - type: bool default: false - --concurrent_osr (concurrent on-stack replacement) - type: bool default: true - --omit_map_checks_for_leaf_maps (do not emit check maps for constant values that have a leaf map, deoptimize the optimized code if the layout of the maps changes.) - type: bool default: true - --turbo_filter (optimization filter for TurboFan compiler) - type: string default: ~ - --trace_turbo (trace generated TurboFan IR) - type: bool default: false - --trace_turbo_graph (trace generated TurboFan graphs) - type: bool default: false - --trace_turbo_cfg_file (trace turbo cfg graph (for C1 visualizer) to a given file name) - type: string default: NULL - --trace_turbo_types (trace TurboFan's types) - type: bool default: true - --trace_turbo_scheduler (trace TurboFan's scheduler) - type: bool default: false - --trace_turbo_reduction (trace TurboFan's various reducers) - type: bool default: false - --trace_turbo_jt (trace TurboFan's jump threading) - type: bool default: false - --turbo_asm (enable TurboFan for asm.js code) - type: bool default: true - --turbo_verify (verify TurboFan graphs at each phase) - type: bool default: false - --turbo_stats (print TurboFan statistics) - type: bool default: false - --turbo_types (use typed lowering in TurboFan) - type: bool default: true - --turbo_source_positions (track source code positions when building TurboFan IR) - type: bool default: false - --context_specialization (enable context specialization in TurboFan) - type: bool default: false - --turbo_deoptimization (enable deoptimization in TurboFan) - type: bool default: false - --turbo_inlining (enable inlining in TurboFan) - type: bool default: false - --turbo_inlining_intrinsics (enable inlining of intrinsics in TurboFan) - type: bool default: false - --trace_turbo_inlining (trace TurboFan inlining) - type: bool default: false - --loop_assignment_analysis (perform loop assignment analysis) - type: bool default: true - --turbo_profiling (enable profiling in TurboFan) - type: bool default: false - --turbo_reuse_spill_slots (reuse spill slots in TurboFan) - type: bool default: true - --turbo_delay_ssa_decon (delay ssa deconstruction in TurboFan register allocator) - type: bool default: false - --turbo_move_optimization (optimize gap moves in TurboFan) - type: bool default: true - --turbo_jt (enable jump threading) - type: bool default: true - --typed_array_max_size_in_heap (threshold for in-heap typed array) - type: int default: 64 - --frame_count (number of stack frames inspected by the profiler) - type: int default: 1 - --interrupt_budget (execution budget before interrupt is triggered) - type: int default: 6144 - --type_info_threshold (percentage of ICs that must have type info to allow optimization) - type: int default: 25 - --generic_ic_threshold (max percentage of megamorphic/generic ICs to allow optimization) - type: int default: 30 - --self_opt_count (call count before self-optimization) - type: int default: 130 - --trace_opt_verbose (extra verbose compilation tracing) - type: bool default: false - --debug_code (generate extra code (assertions) for debugging) - type: bool default: false - --code_comments (emit comments in code disassembly) - type: bool default: false - --enable_sse3 (enable use of SSE3 instructions if available) - type: bool default: true - --enable_sse4_1 (enable use of SSE4.1 instructions if available) - type: bool default: true - --enable_sahf (enable use of SAHF instruction if available (X64 only)) - type: bool default: true - --enable_avx (enable use of AVX instructions if available) - type: bool default: true - --enable_fma3 (enable use of FMA3 instructions if available) - type: bool default: true - --enable_vfp3 (enable use of VFP3 instructions if available) - type: bool default: true - --enable_armv7 (enable use of ARMv7 instructions if available (ARM only)) - type: bool default: true - --enable_armv8 (enable use of ARMv8 instructions if available (ARM 32-bit only)) - type: bool default: true - --enable_neon (enable use of NEON instructions if available (ARM only)) - type: bool default: true - --enable_sudiv (enable use of SDIV and UDIV instructions if available (ARM only)) - type: bool default: true - --enable_mls (enable use of MLS instructions if available (ARM only)) - type: bool default: true - --enable_movw_movt (enable loading 32-bit constant by means of movw/movt instruction pairs (ARM only)) - type: bool default: false - --enable_unaligned_accesses (enable unaligned accesses for ARMv7 (ARM only)) - type: bool default: true - --enable_32dregs (enable use of d16-d31 registers on ARM - this requires VFP3) - type: bool default: true - --enable_vldr_imm (enable use of constant pools for double immediate (ARM only)) - type: bool default: false - --force_long_branches (force all emitted branches to be in long mode (MIPS only)) - type: bool default: false - --expose_natives_as (expose natives in global object) - type: string default: NULL - --expose_debug_as (expose debug in global object) - type: string default: NULL - --expose_free_buffer (expose freeBuffer extension) - type: bool default: false - --expose_gc (expose gc extension) - type: bool default: false - --expose_gc_as (expose gc extension under the specified name) - type: string default: NULL - --expose_externalize_string (expose externalize string extension) - type: bool default: false - --expose_trigger_failure (expose trigger-failure extension) - type: bool default: false - --stack_trace_limit (number of stack frames to capture) - type: int default: 10 - --builtins_in_stack_traces (show built-in functions in stack traces) - type: bool default: false - --disable_native_files (disable builtin natives files) - type: bool default: false - --inline_new (use fast inline allocation) - type: bool default: true - --trace_codegen (print name of functions for which code is generated) - type: bool default: false - --trace (trace function calls) - type: bool default: false - --mask_constants_with_cookie (use random jit cookie to mask large constants) - type: bool default: true - --lazy (use lazy compilation) - type: bool default: true - --trace_opt (trace lazy optimization) - type: bool default: false - --trace_opt_stats (trace lazy optimization statistics) - type: bool default: false - --opt (use adaptive optimizations) - type: bool default: true - --always_opt (always try to optimize functions) - type: bool default: false - --always_osr (always try to OSR functions) - type: bool default: false - --prepare_always_opt (prepare for turning on always opt) - type: bool default: false - --trace_deopt (trace optimize function deoptimization) - type: bool default: false - --trace_stub_failures (trace deoptimization of generated code stubs) - type: bool default: false - --serialize_toplevel (enable caching of toplevel scripts) - type: bool default: true - --serialize_inner (enable caching of inner functions) - type: bool default: false - --trace_serializer (print code serializer trace) - type: bool default: false - --min_preparse_length (minimum length for automatic enable preparsing) - type: int default: 1024 - --max_opt_count (maximum number of optimization attempts before giving up.) - type: int default: 10 - --compilation_cache (enable compilation cache) - type: bool default: true - --cache_prototype_transitions (cache prototype transitions) - type: bool default: true - --cpu_profiler_sampling_interval (CPU profiler sampling interval in microseconds) - type: int default: 1000 - --trace_debug_json (trace debugging JSON request/response) - type: bool default: false - --trace_js_array_abuse (trace out-of-bounds accesses to JS arrays) - type: bool default: false - --trace_external_array_abuse (trace out-of-bounds-accesses to external arrays) - type: bool default: false - --trace_array_abuse (trace out-of-bounds accesses to all arrays) - type: bool default: false - --enable_liveedit (enable liveedit experimental feature) - type: bool default: true - --hard_abort (abort by crashing) - type: bool default: true - --stack_size (default size of stack region v8 is allowed to use (in kBytes)) - type: int default: 984 - --max_stack_trace_source_length (maximum length of function source code printed in a stack trace.) - type: int default: 300 - --always_inline_smi_code (always inline smi code in non-opt code) - type: bool default: false - --min_semi_space_size (min size of a semi-space (in MBytes), the new space consists of twosemi-spaces) - type: int default: 0 - --target_semi_space_size (target size of a semi-space (in MBytes) before triggering a GC) - type: int default: 0 - --max_semi_space_size (max size of a semi-space (in MBytes), the new space consists of twosemi-spaces) - type: int default: 0 - --semi_space_growth_factor (factor by which to grow the new space) - type: int default: 2 - --experimental_new_space_growth_heuristic (Grow the new space based on the percentage of survivors instead of their absolute value.) - type: bool default: false - --max_old_space_size (max size of the old space (in Mbytes)) - type: int default: 0 - --initial_old_space_size (initial old space size (in Mbytes)) - type: int default: 0 - --max_executable_size (max size of executable memory (in Mbytes)) - type: int default: 0 - --gc_global (always perform global GCs) - type: bool default: false - --gc_interval (garbage collect after allocations) - type: int default: -1 - --trace_gc (print one trace line following each garbage collection) - type: bool default: false - --trace_gc_nvp (print one detailed trace line in name=value format after each garbage collection) - type: bool default: false - --trace_gc_ignore_scavenger (do not print trace line after scavenger collection) - type: bool default: false - --trace_idle_notification (print one trace line following each idle notification) - type: bool default: false - --trace_idle_notification_verbose (prints the heap state used by the idle notification) - type: bool default: false - --print_cumulative_gc_stat (print cumulative GC statistics in name=value format on exit) - type: bool default: false - --print_max_heap_committed (print statistics of the maximum memory committed for the heap in name=value format on exit) - type: bool default: false - --trace_gc_verbose (print more details following each garbage collection) - type: bool default: false - --trace_fragmentation (report fragmentation for old pointer and data pages) - type: bool default: false - --collect_maps (garbage collect maps from which no objects can be reached) - type: bool default: true - --weak_embedded_maps_in_optimized_code (make maps embedded in optimized code weak) - type: bool default: true - --weak_embedded_objects_in_optimized_code (make objects embedded in optimized code weak) - type: bool default: true - --flush_code (flush code that we expect not to use again (during full gc)) - type: bool default: true - --flush_code_incrementally (flush code that we expect not to use again (incrementally)) - type: bool default: true - --trace_code_flushing (trace code flushing progress) - type: bool default: false - --age_code (track un-executed functions to age code and flush only old code (required for code flushing)) - type: bool default: true - --incremental_marking (use incremental marking) - type: bool default: true - --incremental_marking_steps (do incremental marking steps) - type: bool default: true - --concurrent_sweeping (use concurrent sweeping) - type: bool default: true - --trace_incremental_marking (trace progress of the incremental marking) - type: bool default: false - --track_gc_object_stats (track object counts and memory usage) - type: bool default: false - --heap_profiler_trace_objects (Dump heap object allocations/movements/size_updates) - type: bool default: false - --use_idle_notification (Use idle notification to reduce memory footprint.) - type: bool default: true - --use_ic (use inline caching) - type: bool default: true - --trace_ic (trace inline cache state transitions) - type: bool default: false - --native_code_counters (generate extra code for manipulating stats counters) - type: bool default: false - --always_compact (Perform compaction on every full GC) - type: bool default: false - --never_compact (Never perform compaction on full GC - testing only) - type: bool default: false - --compact_code_space (Compact code space on full non-incremental collections) - type: bool default: true - --incremental_code_compaction (Compact code space on full incremental collections) - type: bool default: true - --cleanup_code_caches_at_gc (Flush inline caches prior to mark compact collection and flush code caches in maps during mark compact cycle.) - type: bool default: true - --use_marking_progress_bar (Use a progress bar to scan large objects in increments when incremental marking is active.) - type: bool default: true - --zap_code_space (Zap free memory in code space with 0xCC while sweeping.) - type: bool default: true - --random_seed (Default seed for initializing random generator (0, the default, means to use system random).) - type: int default: 0 - --trace_weak_arrays (trace WeakFixedArray usage) - type: bool default: false - --track_prototype_users (keep track of which maps refer to a given prototype object) - type: bool default: false - --use_verbose_printer (allows verbose printing) - type: bool default: true - --allow_natives_syntax (allow natives syntax) - type: bool default: false - --trace_parse (trace parsing and preparsing) - type: bool default: false - --trace_sim (Trace simulator execution) - type: bool default: false - --debug_sim (Enable debugging the simulator) - type: bool default: false - --check_icache (Check icache flushes in ARM and MIPS simulator) - type: bool default: false - --stop_sim_at (Simulator stop after x number of instructions) - type: int default: 0 - --sim_stack_alignment (Stack alingment in bytes in simulator (4 or 8, 8 is default)) - type: int default: 8 - --sim_stack_size (Stack size of the ARM64 and MIPS64 simulator in kBytes (default is 2 MB)) - type: int default: 2048 - --log_regs_modified (When logging register values, only print modified registers.) - type: bool default: true - --log_colour (When logging, try to use coloured output.) - type: bool default: true - --ignore_asm_unimplemented_break (Don't break for ASM_UNIMPLEMENTED_BREAK macros.) - type: bool default: false - --trace_sim_messages (Trace simulator debug messages. Implied by --trace-sim.) - type: bool default: false - --stack_trace_on_illegal (print stack trace when an illegal exception is thrown) - type: bool default: false - --abort_on_uncaught_exception (abort program (dump core) when an uncaught exception is thrown) - type: bool default: false - --randomize_hashes (randomize hashes to avoid predictable hash collisions (with snapshots this option cannot override the baked-in seed)) - type: bool default: true - --hash_seed (Fixed seed to use to hash property keys (0 means random)(with snapshots this option cannot override the baked-in seed)) - type: int default: 0 - --profile_deserialization (Print the time it takes to deserialize the snapshot.) - type: bool default: false - --regexp_optimization (generate optimized regexp code) - type: bool default: true - --testing_bool_flag (testing_bool_flag) - type: bool default: true - --testing_maybe_bool_flag (testing_maybe_bool_flag) - type: maybe_bool default: unset - --testing_int_flag (testing_int_flag) - type: int default: 13 - --testing_float_flag (float-flag) - type: float default: 2.5 - --testing_string_flag (string-flag) - type: string default: Hello, world! - --testing_prng_seed (Seed used for threading test randomness) - type: int default: 42 - --testing_serialization_file (file in which to serialize heap) - type: string default: /tmp/serdes - --startup_blob (Write V8 startup blob file. (mksnapshot only)) - type: string default: NULL - --profile_hydrogen_code_stub_compilation (Print the time it takes to lazily compile hydrogen code stubs.) - type: bool default: false - --predictable (enable predictable mode) - type: bool default: false - --help (Print usage message, including flags, on console) - type: bool default: true - --dump_counters (Dump counters on exit) - type: bool default: false - --debugger (Enable JavaScript debugger) - type: bool default: false - --map_counters (Map counters to a file) - type: string default: - --js_arguments (Pass all remaining arguments to the script. Alias for "--".) - type: arguments default: - --gdbjit (enable GDBJIT interface (disables compacting GC)) - type: bool default: false - --gdbjit_full (enable GDBJIT interface for all code objects) - type: bool default: false - --gdbjit_dump (dump elf objects with debug info to disk) - type: bool default: false - --gdbjit_dump_filter (dump only objects containing this substring) - type: string default: - --force_marking_deque_overflows (force overflows of marking deque by reducing it's size to 64 words) - type: bool default: false - --stress_compaction (stress the GC compactor to flush out bugs (implies --force_marking_deque_overflows)) - type: bool default: false - --log (Minimal logging (no API, code, GC, suspect, or handles samples).) - type: bool default: false - --log_all (Log all events to the log file.) - type: bool default: false - --log_api (Log API events to the log file.) - type: bool default: false - --log_code (Log code events to the log file without profiling.) - type: bool default: false - --log_gc (Log heap samples on garbage collection for the hp2ps tool.) - type: bool default: false - --log_handles (Log global handle events.) - type: bool default: false - --log_snapshot_positions (log positions of (de)serialized objects in the snapshot.) - type: bool default: false - --log_suspect (Log suspect operations.) - type: bool default: false - --prof (Log statistical profiling information (implies --log-code).) - type: bool default: false - --prof_browser_mode (Used with --prof, turns on browser-compatible mode for profiling.) - type: bool default: true - --log_regexp (Log regular expression execution.) - type: bool default: false - --logfile (Specify the name of the log file.) - type: string default: v8.log - --logfile_per_isolate (Separate log files for each isolate.) - type: bool default: true - --ll_prof (Enable low-level linux profiler.) - type: bool default: false - --perf_basic_prof (Enable perf linux profiler (basic support).) - type: bool default: false - --perf_jit_prof (Enable perf linux profiler (experimental annotate support).) - type: bool default: false - --gc_fake_mmap (Specify the name of the file for fake gc mmap used in ll_prof) - type: string default: /tmp/__v8_gc__ - --log_internal_timer_events (Time internal events.) - type: bool default: false - --log_timer_events (Time events including external callbacks.) - type: bool default: false - --log_instruction_stats (Log AArch64 instruction statistics.) - type: bool default: false - --log_instruction_file (AArch64 instruction statistics log file.) - type: string default: arm64_inst.csv - --log_instruction_period (AArch64 instruction statistics logging period.) - type: int default: 4194304 - --redirect_code_traces (output deopt information and disassembly into file code--.asm) - type: bool default: false - --redirect_code_traces_to (output deopt information and disassembly into the given file) - type: string default: NULL - --hydrogen_track_positions (track source code positions when building IR) - type: bool default: false - --trace_elements_transitions (trace elements transitions) - type: bool default: false - --trace_creation_allocation_sites (trace the creation of allocation sites) - type: bool default: false - --print_code_stubs (print code stubs) - type: bool default: false - --test_secondary_stub_cache (test secondary stub cache by disabling the primary one) - type: bool default: false - --test_primary_stub_cache (test primary stub cache by disabling the secondary one) - type: bool default: false - --print_code (print generated code) - type: bool default: false - --print_opt_code (print optimized code) - type: bool default: false - --print_unopt_code (print unoptimized code before printing optimized code based on it) - type: bool default: false - --print_code_verbose (print more information for code) - type: bool default: false - --print_builtin_code (print generated code for builtins) - type: bool default: false - --sodium (print generated code output suitable for use with the Sodium code viewer) - type: bool default: false - --print_all_code (enable all flags related to printing code) - type: bool default: false - -.SH RESOURCES AND DOCUMENTATION - -See the website for documentation http://iojs.org/ - -Mailing list: http://groups.google.com/group/nodejs - -IRC: irc.freenode.net #io.js diff --git a/lib/_debugger.js b/lib/_debugger.js index 4c503d2f5..0d67c7a39 100644 --- a/lib/_debugger.js +++ b/lib/_debugger.js @@ -14,9 +14,9 @@ exports.start = function(argv, stdin, stdout) { argv || (argv = process.argv.slice(2)); if (argv.length < 1) { - console.error('Usage: iojs debug script.js'); - console.error(' iojs debug :'); - console.error(' iojs debug -p '); + console.error('Usage: node debug script.js'); + console.error(' node debug :'); + console.error(' node debug -p '); process.exit(1); } diff --git a/node b/node new file mode 120000 index 000000000..0277cbda6 --- /dev/null +++ b/node @@ -0,0 +1 @@ +out/Release/node \ No newline at end of file diff --git a/node.gyp b/node.gyp index c72b93b13..022b70329 100644 --- a/node.gyp +++ b/node.gyp @@ -78,7 +78,7 @@ 'targets': [ { - 'target_name': 'iojs', + 'target_name': 'node', 'type': '<(node_target_type)', 'dependencies': [ @@ -524,10 +524,10 @@ { 'action_name': 'node_dtrace_provider_o', 'inputs': [ - '<(OBJ_DIR)/iojs/src/node_dtrace.o', + '<(OBJ_DIR)/node/src/node_dtrace.o', ], 'outputs': [ - '<(OBJ_DIR)/iojs/src/node_dtrace_provider.o' + '<(OBJ_DIR)/node/src/node_dtrace_provider.o' ], 'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d', '<@(_inputs)', '-o', '<@(_outputs)' ] @@ -577,7 +577,7 @@ '<(SHARED_INTERMEDIATE_DIR)/v8constants.h' ], 'outputs': [ - '<(OBJ_DIR)/iojs/src/node_dtrace_ustack.o' + '<(OBJ_DIR)/node/src/node_dtrace_ustack.o' ], 'conditions': [ [ 'target_arch=="ia32"', { diff --git a/iojs_README.md b/node_README.md similarity index 87% rename from iojs_README.md rename to node_README.md index ca5ab327b..d0ef9f0de 100644 --- a/iojs_README.md +++ b/node_README.md @@ -1,40 +1,37 @@ -io.js +Node.js ===== -[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/iojs/io.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/nodejs/node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) This repository began as a GitHub fork of [joyent/node](https://github.com/joyent/node). -io.js contributions, releases, and contributorship are under an +Node.js contributions, releases, and contributorship are under an [open governance model](./GOVERNANCE.md). We intend to land, with increasing regularity, releases which are compatible with the npm ecosystem that has been built to date for Node.js. -## Is it io.js or IO.js or iojs or IOjs or iOjS? +## Is it Node.js or NODE.js or nodejs or NODEjs? -The official name is **io.js**, which should never be capitalized, -especially not at the start of a sentence, unless it is being -displayed in a location that is customarily all-caps (such as -the title of man pages). +The official name is **Node.js**. ## Download Binaries, installers, and source tarballs are available at -. +. -**Releases** are available at , listed under -their version string. The symlink +**Releases** are available at , listed under +their version string. The symlink will point to the latest release directory. **Nightly** builds are available at -, listed under their version +, listed under their version string which includes their date (in UTC time) and the commit SHA at the HEAD of the release. **API documentation** is available in each release and nightly -directory under _docs_. points to the the +directory under _docs_. points to the the latest version. ### Verifying Binaries @@ -45,10 +42,10 @@ download. To check that a downloaded file matches the checksum, run it through `sha256sum` with a command such as: ``` -$ grep iojs-vx.y.z.tar.gz SHASUMS256.txt | sha256sum -c - +$ grep node-vx.y.z.tar.gz SHASUMS256.txt | sha256sum -c - ``` -_(Where "iojs-vx.y.z.tar.gz" is the name of the file you have +_(Where "node-vx.y.z.tar.gz" is the name of the file you have downloaded)_ Additionally, releases (not nightlies) have GPG signed copies of @@ -68,7 +65,7 @@ $ gpg --keyserver pool.sks-keyservers.net \ _(Include each of the key fingerprints at the end of this command.)_ You can then use `gpg --verify SHASUMS256.txt.asc` to verify that the -file has been signed by an authorized member of the io.js team. +file has been signed by an authorized member of the Node.js team. Once verified, use the SHASUMS256.txt.asc file to get the checksum for the binary verification command above. @@ -116,7 +113,7 @@ $ make doc To read the documentation: ```text -$ man doc/iojs.1 +$ man doc/node.1 ``` ### Windows @@ -255,16 +252,16 @@ as `deps/icu` (You'll have: `deps/icu/source/...`) * [CONTRIBUTING.md](./CONTRIBUTING.md) * [GOVERNANCE.md](./GOVERNANCE.md) * IRC: - [#io.js on Freenode.net](http://webchat.freenode.net?channels=io.js&uio=d4) -* [iojs/io.js on Gitter](https://gitter.im/iojs/io.js) + [#node.js on Freenode.net](http://webchat.freenode.net?channels=node.js&uio=d4) +* [nodejs/node on Gitter](https://gitter.im/nodejs/node) ## Current Project Team Members -The io.js project team comprises a group of core collaborators and a sub-group +The Node.js project team comprises a group of core collaborators and a sub-group that forms the _Technical Committee_ (TC) which governs the project. For more -information about the governance of the io.js project, see +information about the governance of the Node.js project, see [GOVERNANCE.md](./GOVERNANCE.md). * **Isaac Z. Schlueter** ([@isaacs](https://github.com/isaacs)) <i@izs.me> (Technical Committee) @@ -301,4 +298,4 @@ information about the governance of the io.js project, see * **Yosuke Furukawa** ([@yosuke-furukawa](https://github.com/yosuke-furukawa)) <yosuke.furukawa@gmail.com> Collaborators follow the [COLLABORATOR_GUIDE.md](./COLLABORATOR_GUIDE.md) in -maintaining the io.js project. +maintaining the Node.js project. diff --git a/src/node.cc b/src/node.cc index 4cafe96f4..fad560e4f 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3046,11 +3046,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" @@ -3085,7 +3085,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"); } diff --git a/src/node.h b/src/node.h index acdfe5740..4d8551436 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_version.h b/src/node_version.h index 75fc68783..404202b5a 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -45,6 +45,6 @@ * an API is broken in the C++ side, including in v8 or * other dependencies. */ -#define NODE_MODULE_VERSION 44 /* io.js v2.0.0 */ +#define NODE_MODULE_VERSION 44 /* Node.js v2.0.0 */ #endif /* SRC_NODE_VERSION_H_ */ diff --git a/src/res/node.rc b/src/res/node.rc index 526f795b1..587843df2 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 9e8c477b1..efdc26d3d 100644 --- a/src/res/node_etw_provider.man +++ b/src/res/node_etw_provider.man @@ -7,8 +7,8 @@ + resourceFileName="node.exe" + messageFileName="node.exe"> node compatibility symlink. - link_target = 'bin/node' - link_path = abspath(install_path, link_target) - if action == uninstall: - action([link_path], link_target) - elif action == install: - try_symlink('iojs', link_path) - else: - assert(0) # Unhandled action type. + action(['out/Release/node' + exeext], 'bin/node' + exeext) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') @@ -150,9 +139,9 @@ def files(action): action(['src/node.stp'], 'share/systemtap/tapset/') if 'freebsd' in sys.platform or 'openbsd' in sys.platform: - action(['doc/iojs.1'], 'man/man1/') + action(['doc/node.1'], 'man/man1/') else: - action(['doc/iojs.1'], 'share/man/man1/') + action(['doc/node.1'], 'share/man/man1/') if 'true' == variables.get('node_install_npm'): npm_files(action) diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index 4ca4d5568..8d17a6cfb 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -6,7 +6,7 @@ 3.5 {1d808ff0-b5a9-4be9-859d-b334b6f48be2} 2.0 - iojs-v$(NodeVersion)-$(Platform) + node-v$(NodeVersion)-$(Platform) Package True $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index 6ba74cb45..ad25cde4d 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -2,11 +2,11 @@ - - - + + + - + @@ -23,11 +23,11 @@ + DowngradeErrorMessage="A later version of Node.js is already installed. Setup will now exit."/> - + - + @@ -40,8 +40,8 @@ @@ -49,24 +49,17 @@ - - - - + Description="Installs support for Node.js-specific performance counters."> + Description="Installs support for event tracing (ETW) events generated by Node.js."> @@ -74,7 +67,7 @@ + Description="Install npm, the recommended package manager for Node.js."> @@ -85,18 +78,18 @@ + Description="Add start menu entries that link the the online documentation for Node.js $(var.ProductVersion) and the Node.js website."> + Description="Add Node.js, npm, and modules that were globally installed by npm to the PATH environment variable."> + Title="Node.js and npm" + Description="Add Node.js and npm (if installed) to the PATH environment variable."> @@ -110,24 +103,18 @@ - + - + - - - - - - + @@ -145,7 +132,7 @@ - + @@ -165,17 +152,17 @@ Type="string" Value="$(var.ProductVersion)"/> @@ -262,13 +249,6 @@ - - @@ -279,9 +259,7 @@ Return="check" /> - - $NodeAlias = 3 - + @@ -329,7 +307,7 @@ NOT Installed 1 - + diff --git a/tools/msvs/nodevars.bat b/tools/msvs/nodevars.bat index 2b7915662..22d2ec48d 100644 --- a/tools/msvs/nodevars.bat +++ b/tools/msvs/nodevars.bat @@ -1,24 +1,24 @@ @echo off -rem Ensure this io.js and npm are first in the PATH +rem Ensure this Node.js and npm are first in the PATH set PATH=%APPDATA%\npm;%~dp0;%PATH% setlocal enabledelayedexpansion pushd "%~dp0" -rem Figure out the io.js version. -set print_version=.\iojs.exe -p -e "process.versions.node + ' (' + process.arch + ')'" +rem Figure out the Node.js version. +set print_version=.\node.exe -p -e "process.versions.node + ' (' + process.arch + ')'" for /F "usebackq delims=" %%v in (`%print_version%`) do set version=%%v rem Print message. if exist npm.cmd ( - echo Your environment has been set up for using io.js !version! and npm. + echo Your environment has been set up for using Node.js !version! and npm. ) else ( - echo Your environment has been set up for using io.js !version!. + echo Your environment has been set up for using Node.js !version!. ) popd endlocal -rem If we're in the io.js directory, change to the user's home dir. +rem If we're in the Node.js directory, change to the user's home dir. if "%CD%\"=="%~dp0" cd /d "%HOMEDRIVE%%HOMEPATH%" diff --git a/tools/osx-pkg.pmdoc/01local.xml b/tools/osx-pkg.pmdoc/01local.xml index 1d99404e4..1fef475f6 100644 --- a/tools/osx-pkg.pmdoc/01local.xml +++ b/tools/osx-pkg.pmdoc/01local.xml @@ -1 +1 @@ -org.iojs.pkg1.0../out/dist-osx/usr/local//usr/localinstallTo.isRelativeTypeinstallTolocationTyperelocatableinstallFrom.pathinstallTo.isAbsoluteTypeidentifierparentinstallTo.pathinstallFrom.isRelativeType +org.nodejs.pkg1.0../out/dist-osx/usr/local//usr/localinstallTo.isRelativeTypeinstallTolocationTyperelocatableinstallFrom.pathinstallTo.isAbsoluteTypeidentifierparentinstallTo.pathinstallFrom.isRelativeType diff --git a/tools/osx-pkg.pmdoc/02npm.xml b/tools/osx-pkg.pmdoc/02npm.xml index 06360b5df..577298efe 100644 --- a/tools/osx-pkg.pmdoc/02npm.xml +++ b/tools/osx-pkg.pmdoc/02npm.xml @@ -1 +1 @@ -org.iojs.npm.pkg1.0../deps/npm/usr/local/lib/node_modules/npminstallTo.pathinstallFrom.isRelativeTypeinstallToscripts.postinstall.isRelativeTypeparentinstallTo.isAbsoluteTypeosx-pkg-postinstall.sh +org.nodejs.npm.pkg1.0../deps/npm/usr/local/lib/node_modules/npminstallTo.pathinstallFrom.isRelativeTypeinstallToscripts.postinstall.isRelativeTypeparentinstallTo.isAbsoluteTypeosx-pkg-postinstall.sh diff --git a/tools/osx-pkg.pmdoc/index.xml.tmpl b/tools/osx-pkg.pmdoc/index.xml.tmpl index 7376a9d37..7d27f3223 100644 --- a/tools/osx-pkg.pmdoc/index.xml.tmpl +++ b/tools/osx-pkg.pmdoc/index.xml.tmpl @@ -1,17 +1,15 @@ -io.js/Users/iojs/Desktop/iojs.pkgorg.iojs../doc/osx_installer_logo.png../LICENSENode.js/Users/node/Desktop/node.pkgorg.nodejs../doc/osx_installer_logo.png../LICENSE +- Rename to Node.js + * Mon Apr 13 2015 Dan Varga - Fix paths for changelog and manpage diff --git a/tools/rpm/rpmbuild.sh b/tools/rpm/rpmbuild.sh index 3f3643b8b..6f2d0d123 100755 --- a/tools/rpm/rpmbuild.sh +++ b/tools/rpm/rpmbuild.sh @@ -38,7 +38,7 @@ fi set -x sed -re "s/%define _version .+/%define _version ${VERSION}/" \ - "$TOOLSDIR/iojs.spec" > $RPMBUILD_PATH/SPECS/iojs.spec -tar --exclude-vcs --transform="s|^|iojs-${VERSION}/|" \ - -czf $RPMBUILD_PATH/SOURCES/iojs-v${VERSION}.tar.gz . -rpmbuild $* -ba $RPMBUILD_PATH/SPECS/iojs.spec + "$TOOLSDIR/node.spec" > $RPMBUILD_PATH/SPECS/node.spec +tar --exclude-vcs --transform="s|^|node-${VERSION}/|" \ + -czf $RPMBUILD_PATH/SOURCES/node-v${VERSION}.tar.gz . +rpmbuild $* -ba $RPMBUILD_PATH/SPECS/node.spec diff --git a/tools/test.py b/tools/test.py index 1de2661dc..64645ccfc 100755 --- a/tools/test.py +++ b/tools/test.py @@ -748,20 +748,20 @@ def __init__(self, workspace, buildspace, verbose, vm, timeout, processor, suppr def GetVm(self, arch, mode): if arch == 'none': - name = 'out/Debug/iojs' if mode == 'debug' else 'out/Release/iojs' + name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node' else: - name = 'out/%s.%s/iojs' % (arch, mode) + name = 'out/%s.%s/node' % (arch, mode) # Currently GYP does not support output_dir for MSVS. # http://code.google.com/p/gyp/issues/detail?id=40 - # It will put the builds into Release/iojs.exe or Debug/iojs.exe + # It will put the builds into Release/node.exe or Debug/node.exe if utils.IsWindows(): out_dir = os.path.join(dirname(__file__), "..", "out") if not exists(out_dir): if mode == 'debug': - name = os.path.abspath('Debug/iojs.exe') + name = os.path.abspath('Debug/node.exe') else: - name = os.path.abspath('Release/iojs.exe') + name = os.path.abspath('Release/node.exe') else: name = os.path.abspath(name + '.exe') diff --git a/vcbuild.bat b/vcbuild.bat index fb6881c0e..4ab3e677d 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -127,14 +127,14 @@ if errorlevel 1 goto exit @rem Skip signing if the `nosign` option was specified. if defined nosign goto licensertf -signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs.exe +signtool sign /a /d "Node.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\node.exe if errorlevel 1 echo Failed to sign exe&goto exit :licensertf @rem Skip license.rtf generation if not requested. if not defined licensertf goto msi -%config%\iojs tools\license2rtf.js < LICENSE > %config%\license.rtf +%config%\node tools\license2rtf.js < LICENSE > %config%\license.rtf if errorlevel 1 echo Failed to generate license.rtf&goto exit :msi @@ -146,12 +146,12 @@ if not defined NIGHTLY goto msibuild set NODE_VERSION=%NODE_VERSION%.%NIGHTLY% :msibuild -echo Building iojs-%NODE_VERSION% +echo Building node-%NODE_VERSION% msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:Configuration=%config% /p:Platform=%msiplatform% /p:NodeVersion=%NODE_VERSION% %noetw_msi_arg% %noperfctr_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo if errorlevel 1 goto exit if defined nosign goto run -signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs-v%NODE_VERSION%-%msiplatform%.msi +signtool sign /a /d "Node.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\node-v%NODE_VERSION%-%msiplatform%.msi if errorlevel 1 echo Failed to sign msi&goto exit :run @@ -160,7 +160,7 @@ if errorlevel 1 echo Failed to sign msi&goto exit :build-node-weak @rem Build node-weak if required if "%buildnodeweak%"=="" goto run-tests -"%config%\iojs" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild --directory="%~dp0test\gc\node_modules\weak" --nodedir="%~dp0." +"%config%\node" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild --directory="%~dp0test\gc\node_modules\weak" --nodedir="%~dp0." if errorlevel 1 goto build-node-weak-failed goto run-tests @@ -181,7 +181,7 @@ goto jslint :jslint if not defined jslint goto exit echo running jslint -%config%\iojs tools/eslint/bin/eslint.js src lib --reset --quiet +%config%\node tools/eslint/bin/eslint.js src lib --reset --quiet goto exit :create-msvs-files-failed @@ -207,5 +207,5 @@ rem *************** :getnodeversion set NODE_VERSION= for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i -if not defined NODE_VERSION echo Cannot determine current version of io.js & exit /b 1 +if not defined NODE_VERSION echo Cannot determine current version of Node.js & exit /b 1 goto :EOF