From f69962a4f70fddcc26ead5a3357091c5a931467b Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 14 Jun 2021 17:20:40 +0300 Subject: Update macOS installation instructions. --- docs/markdown/SimpleStart.md | 48 ++++++++++++---------------------- docs/markdown/images/meson_mac1.png | Bin 0 -> 62177 bytes docs/markdown/images/meson_mac2.png | Bin 0 -> 90454 bytes docs/markdown/images/meson_mac3.png | Bin 0 -> 122178 bytes docs/markdown/images/meson_mac4.png | Bin 0 -> 77246 bytes docs/markdown/images/meson_mac5.png | Bin 0 -> 198834 bytes docs/markdown/images/osx_download.png | Bin 177582 -> 0 bytes docs/markdown/images/osx_working.png | Bin 152087 -> 0 bytes docs/markdown/images/osx_xcode.png | Bin 242557 -> 0 bytes 9 files changed, 16 insertions(+), 32 deletions(-) create mode 100755 docs/markdown/images/meson_mac1.png create mode 100755 docs/markdown/images/meson_mac2.png create mode 100755 docs/markdown/images/meson_mac3.png create mode 100755 docs/markdown/images/meson_mac4.png create mode 100755 docs/markdown/images/meson_mac5.png delete mode 100644 docs/markdown/images/osx_download.png delete mode 100644 docs/markdown/images/osx_working.png delete mode 100644 docs/markdown/images/osx_xcode.png (limited to 'docs') 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 Binary files /dev/null and b/docs/markdown/images/meson_mac1.png differ diff --git a/docs/markdown/images/meson_mac2.png b/docs/markdown/images/meson_mac2.png new file mode 100755 index 0000000..e5c434d Binary files /dev/null and b/docs/markdown/images/meson_mac2.png differ diff --git a/docs/markdown/images/meson_mac3.png b/docs/markdown/images/meson_mac3.png new file mode 100755 index 0000000..babada1 Binary files /dev/null and b/docs/markdown/images/meson_mac3.png differ diff --git a/docs/markdown/images/meson_mac4.png b/docs/markdown/images/meson_mac4.png new file mode 100755 index 0000000..e8089ad Binary files /dev/null and b/docs/markdown/images/meson_mac4.png differ diff --git a/docs/markdown/images/meson_mac5.png b/docs/markdown/images/meson_mac5.png new file mode 100755 index 0000000..507fcda Binary files /dev/null and b/docs/markdown/images/meson_mac5.png differ diff --git a/docs/markdown/images/osx_download.png b/docs/markdown/images/osx_download.png deleted file mode 100644 index 3315886..0000000 Binary files a/docs/markdown/images/osx_download.png and /dev/null differ diff --git a/docs/markdown/images/osx_working.png b/docs/markdown/images/osx_working.png deleted file mode 100644 index 0b1320f..0000000 Binary files a/docs/markdown/images/osx_working.png and /dev/null differ diff --git a/docs/markdown/images/osx_xcode.png b/docs/markdown/images/osx_xcode.png deleted file mode 100644 index 14a6282..0000000 Binary files a/docs/markdown/images/osx_xcode.png and /dev/null differ -- cgit v1.1