From b3002b43a186027d1255c86d5cf301811674ec22 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Feb 2015 16:01:37 -0800 Subject: [PATCH 1/4] Use node 0.12 in default nodenv config --- .node-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.node-version b/.node-version index b58b2ff99..87a1cf595 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v0.10.33 +v0.12.0 From d70e2b49128442c1b0ee72f91de4afbc393fc5c8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Feb 2015 16:01:45 -0800 Subject: [PATCH 2/4] Install apm with a 0.10.35 target --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index cda896d46..270abff7c 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -64,7 +64,7 @@ function bootstrap() { var buildInstallCommand = initialNpmCommand + npmFlags + 'install'; var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')}; - var apmInstallCommand = npmPath + npmFlags + 'install'; + var apmInstallCommand = npmPath + npmFlags + '--target=0.10.35 ' + 'install'; var apmInstallOptions = {cwd: apmInstallPath}; var moduleInstallCommand = apmPath + ' install' + apmFlags; var dedupeApmCommand = apmPath + ' dedupe' + apmFlags; From c049ab7e62b4efdb16586ce30dd91a2396b3d594 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Feb 2015 16:02:23 -0800 Subject: [PATCH 3/4] :arrow_up: npm@2.5.1 --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index f7784e956..ea5b8e6de 100644 --- a/build/package.json +++ b/build/package.json @@ -26,7 +26,7 @@ "harmony-collections": "~0.3.8", "legal-eagle": "~0.9.0", "minidump": "~0.8", - "npm": "~1.4.5", + "npm": "2.5.1", "rcedit": "~0.3.0", "request": "~2.27.0", "rimraf": "~2.2.2", From 65030f8252326d913fd8868953cab51a93125f64 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Feb 2015 16:17:38 -0800 Subject: [PATCH 4/4] :memo: Mention node 0.12.x and io.js 1.x support --- docs/build-instructions/linux.md | 2 +- docs/build-instructions/os-x.md | 2 +- docs/build-instructions/windows.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index 6cb985e87..83815dd4a 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -7,7 +7,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform. * OS with 64-bit or 32-bit architecture * C++ toolchain * [Git](http://git-scm.com/) - * [Node.js](http://nodejs.org/download/) v0.10.x + * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x) * [npm](https://www.npmjs.com/) v1.4.x (bundled with Node.js) * `npm -v` to check the version. * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2. diff --git a/docs/build-instructions/os-x.md b/docs/build-instructions/os-x.md index b07e3bcf8..d8685cff8 100644 --- a/docs/build-instructions/os-x.md +++ b/docs/build-instructions/os-x.md @@ -3,7 +3,7 @@ ## Requirements * OS X 10.8 or later - * [node.js](http://nodejs.org/download/) v0.10.x + * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x) * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (run `xcode-select --install` to install) ## Instructions diff --git a/docs/build-instructions/windows.md b/docs/build-instructions/windows.md index 02934ee33..fddb941c7 100644 --- a/docs/build-instructions/windows.md +++ b/docs/build-instructions/windows.md @@ -5,7 +5,7 @@ ### On Windows 7 * [Visual C++ 2010 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4) * [Visual Studio 2010 Service Pack 1](http://www.microsoft.com/en-us/download/details.aspx?id=23691) - * [node.js](http://nodejs.org/download/) v0.10.x + * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x) * For 64-bit builds of node and native modules you **must** have the [Windows 7 64-bit SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279). You may also need the [compiler update for the Windows SDK 7.1](http://www.microsoft.com/en-us/download/details.aspx?id=4422) @@ -18,7 +18,7 @@ ### On Windows 8 * [Visual Studio Express 2013 for Windows Desktop](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_2) - * [node.js](http://nodejs.org/download/) v0.10.x + * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x) * [Python](https://www.python.org/downloads/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp)) * [GitHub for Windows](http://windows.github.com/)