aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-06-14 17:20:40 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2021-06-15 19:45:09 +0300
commitf69962a4f70fddcc26ead5a3357091c5a931467b (patch)
tree2ddd2141d1d9b2798452e76d690b969fe66996a9 /docs
parent10863057159c8850e90c7bd5fb05b9ae1ba81e3e (diff)
downloadmeson-f69962a4f70fddcc26ead5a3357091c5a931467b.zip
meson-f69962a4f70fddcc26ead5a3357091c5a931467b.tar.gz
meson-f69962a4f70fddcc26ead5a3357091c5a931467b.tar.bz2
Update macOS installation instructions.
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/SimpleStart.md48
-rwxr-xr-xdocs/markdown/images/meson_mac1.pngbin0 -> 62177 bytes
-rwxr-xr-xdocs/markdown/images/meson_mac2.pngbin0 -> 90454 bytes
-rwxr-xr-xdocs/markdown/images/meson_mac3.pngbin0 -> 122178 bytes
-rwxr-xr-xdocs/markdown/images/meson_mac4.pngbin0 -> 77246 bytes
-rwxr-xr-xdocs/markdown/images/meson_mac5.pngbin0 -> 198834 bytes
-rw-r--r--docs/markdown/images/osx_download.pngbin177582 -> 0 bytes
-rw-r--r--docs/markdown/images/osx_working.pngbin152087 -> 0 bytes
-rw-r--r--docs/markdown/images/osx_xcode.pngbin242557 -> 0 bytes
9 files changed, 16 insertions, 32 deletions
diff --git a/docs/markdown/SimpleStart.md b/docs/markdown/SimpleStart.md
index 2c18dc4..371f1be 100644
--- a/docs/markdown/SimpleStart.md
+++ b/docs/markdown/SimpleStart.md
@@ -91,47 +91,31 @@ versions.
### macOS
-Due to the way Apple has set things up, getting macOS working is a bit
-more complicated. The first thing you need to do is to install the
-newest version of Python 3 [from the project's web
-site](https://www.python.org/downloads/mac-osx/).
-
-![Downloading the Python for macOS installer](images/osx_download.png)
-
-Once you have a working Python you can install the necessary bits
-using Python's Pip package manager.
-
- pip install --user meson ninja
+Start by downloading the installation package from [the Releases
+page](https://github.com/mesonbuild/meson/releases).
-This will install the necessary files in your home directory, but
-sadly they are not directly usable. You need to add the directory they
-are written to in the system's `PATH` environment variable so the
-programs can be used directly from the terminal. This requires editing
-a text configuration file.
+![Downloading the macOS installer](images/meson_mac1.png)
-The correct file to edit depends on which shell you are currently
-using. If you have an old macOS install it is probably Bash and the
-file you need to edit is `.bash_profile`. If, on the other hand, you
-have a new macOS install then you are probably using Zsh and the file
-to edit is `.zshrc`. In either case the file should be in your home
-directory.
+Double click the downloaded installer to start. If you are running a
+new macOS version, it might refuse to run the application with the
+following error message:
-For Bash the line you need to add is this:
+![A macOS signing warning](images/mac_meson2.png)
- PATH=$PATH:/Users/username/Library/Python/3.9/bin
+This can be fixed by starting System Preferences, selecting the
+Security and Privacy entry. At the bottom it shows the blocked app and
+you can enable it by clicking on the "Open anyway" button.
-whereas for Zsh it is this:
+![Security settings](images/mac_meson3.png)
- export PATH=$PATH:/Users/username/Library/Python/3.9/bin
+Now the installer should start. If not, double click on the downloaded
+installer file again.
-In both case you need to change the values for `username` and `3.9`.
-The former needs to be substituted with your Unix username while the
-latter needs to contain the actual Python version you installed.
+![Installer running](images/mac_meson4.png)
-Once this is done close the terminal application and start it again.
-Now you should be able to run the `meson` command.
+Once the installation is finished you can verify that the system is working via the terminal app.
-![A working macOS install](images/osx_working.png)
+![A successful install](images/mac_meson5.png)
## Running Meson
diff --git a/docs/markdown/images/meson_mac1.png b/docs/markdown/images/meson_mac1.png
new file mode 100755
index 0000000..17eae0a
--- /dev/null
+++ b/docs/markdown/images/meson_mac1.png
Binary files differ
diff --git a/docs/markdown/images/meson_mac2.png b/docs/markdown/images/meson_mac2.png
new file mode 100755
index 0000000..e5c434d
--- /dev/null
+++ b/docs/markdown/images/meson_mac2.png
Binary files differ
diff --git a/docs/markdown/images/meson_mac3.png b/docs/markdown/images/meson_mac3.png
new file mode 100755
index 0000000..babada1
--- /dev/null
+++ b/docs/markdown/images/meson_mac3.png
Binary files differ
diff --git a/docs/markdown/images/meson_mac4.png b/docs/markdown/images/meson_mac4.png
new file mode 100755
index 0000000..e8089ad
--- /dev/null
+++ b/docs/markdown/images/meson_mac4.png
Binary files differ
diff --git a/docs/markdown/images/meson_mac5.png b/docs/markdown/images/meson_mac5.png
new file mode 100755
index 0000000..507fcda
--- /dev/null
+++ b/docs/markdown/images/meson_mac5.png
Binary files differ
diff --git a/docs/markdown/images/osx_download.png b/docs/markdown/images/osx_download.png
deleted file mode 100644
index 3315886..0000000
--- a/docs/markdown/images/osx_download.png
+++ /dev/null
Binary files differ
diff --git a/docs/markdown/images/osx_working.png b/docs/markdown/images/osx_working.png
deleted file mode 100644
index 0b1320f..0000000
--- a/docs/markdown/images/osx_working.png
+++ /dev/null
Binary files differ
diff --git a/docs/markdown/images/osx_xcode.png b/docs/markdown/images/osx_xcode.png
deleted file mode 100644
index 14a6282..0000000
--- a/docs/markdown/images/osx_xcode.png
+++ /dev/null
Binary files differ