aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-06 16:56:38 -0500
committerGitHub <noreply@github.com>2016-10-06 16:56:38 -0500
commita90d207c468a9a8a99cfafa301fed3f48eee5ba3 (patch)
treed93f513b7f045319ff756e7fff5576072f07a335
parentff04558ce26203cc3eb63edc9a15a6e6622b814a (diff)
parentbf384ef855473fa79d28b75ec4079a5502e0bd15 (diff)
downloadservo-a90d207c468a9a8a99cfafa301fed3f48eee5ba3.tar.gz
servo-a90d207c468a9a8a99cfafa301fed3f48eee5ba3.zip
Auto merge of #13621 - larsbergstrom:add_msvc_instructions, r=metajack
Instructions for building with the MSVC toolchain <!-- Please describe your changes on the following line: --> Adding instructions to build using the MSVC toolchain. r? @vvuk --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x ] `./mach build -d` does not report any errors - [x ] `./mach test-tidy` does not report any errors - [x ] These changes fix #13206 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13621) <!-- Reviewable:end -->
-rw-r--r--README.md31
1 files changed, 29 insertions, 2 deletions
diff --git a/README.md b/README.md
index f5e79970731..5881f984289 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,8 @@ Please select your operating system:
* [Arch Linux](#on-arch-linux)
* [openSUSE](#on-opensuse-linux)
* [Gentoo Linux](#on-gentoo-linux)
-* [Microsoft Windows](#on-windows)
+* [Microsoft Windows (MSVC)](#on-windows-msvc)
+* [Microsoft Windows (mingw)](#on-windows-mingw)
* [Android](#cross-compilation-for-android)
#### OS X
@@ -91,7 +92,26 @@ sudo emerge net-misc/curl media-libs/freeglut \
dev-python/virtualenv dev-python/pip dev-libs/openssl \
x11-libs/libXmu media-libs/glu x11-base/xorg-server
```
-#### On Windows
+#### On Windows MSVC
+
+Install Git for Windows (https://git-scm.com/download/win). DO allow it to add git.exe to the PATH (default
+settings for the installer are fine).
+
+Install Visual Studio 2015 Community Edition (https://www.visualstudio.com/). You MUST add "Visual C++" to the
+list of installed components. It is not on by default.
+
+Install Python for Windows (https://www.python.org/downloads/release/python-2711/). The windows x86-64 MSI installer is fine.
+You should change the installation to install the "Add python.exe to Path" feature.
+
+Install virtualenv.
+
+In a normal Windows Shell (cmd.exe or "Command Prompt" from the start menu), do:
+```
+pip install virtualenv
+```
+If this does not work, you may need to reboot for the changed PATH settings (by the python installer) to take effect.
+
+#### On Windows mingw
Download Python for Windows [here](https://www.python.org/downloads/release/python-2711/). This is
required for the SpiderMonkey build on Windows.
@@ -157,6 +177,13 @@ cd servo
./mach run tests/html/about-mozilla.html
```
+Or on Windows MSVC, in a normal Command Prompt (cmd.exe):
+``` cmd
+git clone https://github.com/servo/servo
+cd servo
+mach.bat build --dev
+```
+
For benchmarking, performance testing, or
real-world use, add the `--release` flag to create an optimized build: