From 7dda4976d70bc445ae88d65a5999b48bc324cfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Mon, 13 Jun 2016 11:24:53 +0100 Subject: [PATCH 1/2] doc: update build instructions for Windows The Visual C++ Build Tools are supported to build Node on Windows and already used in CI, so they should be included in the build instructions. --- BUILDING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index e9bf0bc01337f2..ffff9ba0809640 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -99,8 +99,10 @@ $ node -e "console.log('Hello from Node.js ' + process.version)" Prerequisites: * [Python 2.6 or 2.7](https://www.python.org/downloads/) -* Visual Studio 2013 / 2015, all editions including the Community edition, or -* Visual Studio Express 2013 / 2015 for Desktop +* Either one of: + * [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) + * [Visual Studio](https://www.visualstudio.com/) 2013 / 2015, all editions including the Community edition + * [Visual Studio](https://www.visualstudio.com/) Express 2013 / 2015 for Desktop * Basic Unix tools required for some tests, [Git for Windows](http://git-scm.com/download/win) includes Git Bash and tools which can be included in the global `PATH`. @@ -117,8 +119,8 @@ To run the tests: To test if Node.js was built correctly: -``` -$ node -e "console.log('Hello from Node.js ' + process.version)" +```text +> Release\node -e "console.log('Hello from Node.js ' + process.version)" ``` ### Android / Android-based devices (e.g., Firefox OS) From f650c221c98d258af4bc9be2512aa7f1aea52841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Mon, 13 Jun 2016 16:38:05 +0100 Subject: [PATCH 2/2] fixup --- BUILDING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index ffff9ba0809640..532c478bbb736b 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -99,7 +99,7 @@ $ node -e "console.log('Hello from Node.js ' + process.version)" Prerequisites: * [Python 2.6 or 2.7](https://www.python.org/downloads/) -* Either one of: +* One of: * [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) * [Visual Studio](https://www.visualstudio.com/) 2013 / 2015, all editions including the Community edition * [Visual Studio](https://www.visualstudio.com/) Express 2013 / 2015 for Desktop @@ -120,7 +120,7 @@ To run the tests: To test if Node.js was built correctly: ```text -> Release\node -e "console.log('Hello from Node.js ' + process.version)" +> Release\node -e "console.log('Hello from Node.js', process.version)" ``` ### Android / Android-based devices (e.g., Firefox OS)