aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-06-04 00:05:30 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-03 18:59:24 +0000
commit0b9162c08d68347b4707082250f1a7a13ecb0bc3 (patch)
tree44ffd2c112ecd6882569d29e91af4a5ff6132a1f /docs/markdown
parent107e061506fb0e8f2783ba07de7f6ce79634688b (diff)
downloadmeson-0b9162c08d68347b4707082250f1a7a13ecb0bc3.zip
meson-0b9162c08d68347b4707082250f1a7a13ecb0bc3.tar.gz
meson-0b9162c08d68347b4707082250f1a7a13ecb0bc3.tar.bz2
docs: Add a section about the MSI installer [skip ci]
Diffstat (limited to 'docs/markdown')
-rw-r--r--docs/markdown/Getting-meson.md13
1 files changed, 11 insertions, 2 deletions
diff --git a/docs/markdown/Getting-meson.md b/docs/markdown/Getting-meson.md
index ab6fe41..29f2424 100644
--- a/docs/markdown/Getting-meson.md
+++ b/docs/markdown/Getting-meson.md
@@ -22,14 +22,23 @@ a pull-request process that runs CI and tests several platforms.
## Installing Meson with pip
-Meson is also available in the [Python Package Index] and can be
-installed with `pip3 install meson` to install it system-wide and requires root.
+Meson is available in the [Python Package Index] and can be installed with
+`pip3 install meson` which requires root and will install it system-wide.
Alternatively, you can use `pip3 install --user meson` which will install it
for your user and does not require any special privileges. This will install
the package in `~/.local/`, so you will have to add `~/.local/bin` to your
`PATH`.
+## Installing Meson and Ninja with the MSI installer
+
+We provide an MSI installer on the [GitHub release page] that can be used to
+install both Meson and Ninja at once for Windows. It also contains an embedded
+copy of Python, so scripts that use the [Python module](Python-module.md) and
+do not have any external dependencies will continue to work as expected.
+
+Please note that this is a new feature, so bug reports are expected and welcome!
+
## Dependencies
In the most common case, you will need the [Ninja executable] for using the