Skip to content

Commit 7562cf5

Browse files
BenWiederhakeawesomekling
authored andcommitted
Documentation: Recommend ninja by default
1 parent 9f64424 commit 7562cf5

File tree

1 file changed

+21
-32
lines changed

1 file changed

+21
-32
lines changed

Documentation/BuildInstructions.md

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
### Prerequisites
44

55
#### Linux prerequisites
6-
Make sure you have all the dependencies installed:
6+
Make sure you have all the dependencies installed (`ninja` is optional, but is faster in practice):
77

88
**Debian / Ubuntu**
99
```bash
10-
sudo apt install build-essential cmake curl libmpfr-dev libmpc-dev libgmp-dev e2fsprogs qemu-system-i386 qemu-utils
10+
sudo apt install build-essential cmake curl libmpfr-dev libmpc-dev libgmp-dev e2fsprogs ninja-build qemu-system-i386 qemu-utils
1111
```
1212

1313
**Fedora**
1414
```bash
15-
sudo dnf install curl cmake mpfr-devel libmpc-devel gmp-devel e2fsprogs @"C Development Tools and Libraries" @Virtualization
15+
sudo dnf install curl cmake mpfr-devel libmpc-devel gmp-devel e2fsprogs ninja-build @"C Development Tools and Libraries" @Virtualization
1616
```
1717

1818
**openSUSE**
1919
```bash
20-
sudo zypper install curl cmake mpfr-devel mpc-devel gmp-devel e2fsprogs patch qemu-x86 qemu-audio-pa gcc gcc-c++ patterns-devel-C-C++-devel_C_C++
20+
sudo zypper install curl cmake mpfr-devel mpc-devel ninja gmp-devel e2fsprogs patch qemu-x86 qemu-audio-pa gcc gcc-c++ patterns-devel-C-C++-devel_C_C++
2121
```
2222

2323
**Arch Linux / Manjaro**
2424
```bash
25-
sudo pacman -S --needed base-devel cmake curl mpfr libmpc gmp e2fsprogs qemu qemu-arch-extra
25+
sudo pacman -S --needed base-devel cmake curl mpfr libmpc gmp e2fsprogs ninja qemu qemu-arch-extra
2626
```
2727

2828
**ALT Linux**
2929
```bash
30-
apt-get install curl cmake libmpc-devel gmp-devel e2fsprogs libmpfr-devel patch gcc
30+
apt-get install curl cmake libmpc-devel gmp-devel e2fsprogs libmpfr-devel ninja-build patch gcc
3131
```
3232

3333
Ensure your gcc version is >= 10 with `gcc --version`. Otherwise, install it.
@@ -60,7 +60,7 @@ Ensure your CMake version is >= 3.16 with `cmake --version`. If your system does
6060
#### macOS prerequisites
6161
Make sure you have all the dependencies installed:
6262
```bash
63-
brew install coreutils qemu e2fsprogs m4 autoconf libtool automake bash gcc@10
63+
brew install coreutils qemu e2fsprogs m4 autoconf libtool automake bash gcc@10 ninja
6464
brew install --cask osxfuse
6565
Toolchain/BuildFuseExt2.sh
6666
```
@@ -77,43 +77,45 @@ Notes:
7777

7878
#### OpenBSD prerequisites
7979
```
80-
pkg_add bash gmp gcc git gmake sudo
80+
$ pkg_add bash gcc git gmake gmp ninja sudo
8181
```
8282

8383
#### FreeBSD prerequisites
8484
```
85-
$ pkg add coreutils gmake bash sudo git
85+
$ pkg add bash coreutils git gmake ninja sudo
8686
```
8787

8888
#### Windows
8989
For Windows, you will require Windows Subsystem for Linux 2 (WSL2). [Follow the WSL2 instructions here.](https://github.com/SerenityOS/serenity/blob/master/Documentation/NotesOnWSL.md)
9090
Do note the ```Hardware acceleration``` and ```Note on filesystems``` sections, otherwise performance will be terrible.
9191
Once you have installed a distro for WSL2, follow the Linux prerequisites above for the distro you installed, then continue as normal.
9292

93+
You may also want to install [ninja](https://github.com/ninja-build/ninja/releases)
94+
9395
### Build
9496
Go into the `Toolchain/` directory and run the **BuildIt.sh** script:
9597
```bash
9698
$ cd Toolchain
9799
$ ./BuildIt.sh
98100
```
99101

100-
Building the toolchain will also automatically create a `Build/` directory for the build to live in, and build cmake inside that directory.
102+
Building the toolchain will also automatically create a `Build/` directory for the build to live in.
101103

102-
Once the toolchain and cmake have been built, go into the `Build/` directory and run the `make` and `make install` commands:
104+
Once the toolchain has been built, go into the `Build/` directory and run the commands. Note that while `ninja` seems to be faster, you can also just use GNU make, by omitting `-G Ninja` and calling `make` instead of `ninja`:
103105
```bash
104106
$ cd ..
105107
$ cd Build
106-
$ cmake ..
107-
$ make
108-
$ make install
108+
$ cmake .. -G Ninja
109+
$ ninja
110+
$ ninja install
109111
```
110112

111-
This will compile all of SerenityOS and install the built files into `Root/` inside the build tree. `make install` actually pulls in the regular `make` (`make all`) automatically, so there isn't really a need to run it explicitly. You may also want ask `make` to build things in parallel by using `-j`, optionally specifying the maximum number of jobs to run.
113+
This will compile all of SerenityOS and install the built files into `Root/` inside the build tree. `ninja install` actually pulls in the regular `ninja` (`ninja all`) automatically, so there isn't really a need to run it explicitly. `ninja` will automatically build as many jobs in parallel as it detects processors; `make` builds only one job in parallel. (Use the `-j` option with an argument if you want to change this.)
112114

113-
Now to build a disk image, run `make image`, and if nothing breaks too much, take it for a spin by using `make run`.
115+
Now to build a disk image, run `ninja image`, and take it for a spin by using `ninja run`.
114116
```bash
115-
$ make image
116-
$ make run
117+
$ ninja image
118+
$ ninja run
117119
```
118120

119121
Note that the `anon` user is able to become `root` without password by default, as a development convenience.
@@ -125,20 +127,7 @@ Bare curious users may even consider sourcing suitable hardware to [install Sere
125127

126128
Outside of QEMU, Serenity will run on VirtualBox. If you're curious, see how to [install Serenity on VirtualBox.](https://github.com/SerenityOS/serenity/blob/master/Documentation/VirtualBox.md)
127129

128-
Later on, when you `git pull` to get the latest changes, there's no need to rebuild the toolchain. You can simply run `make install`, `make image`, `make run` again. CMake will only rebuild those parts that have been updated.
129-
130-
#### Faster than make: "Ninja"
131-
132-
You may also want to replace `make` with `ninja` in the above commands for some additional build speed benefits, like reduced double-building of headers.
133-
Most of the process stays the same:
134-
- Go to an empty directory at the root (e.g. `Build/`) and call `cmake .. -G Ninja` inside that directory
135-
- You might either create a new directory or reuse the existing `Build` directory after cleaning it.
136-
- `make` becomes `ninja`
137-
- `make install` becomes `ninja install`
138-
- `make image` becomes `ninja image`
139-
- `make run` becomes `ninja run`
140-
141-
Note that ninja automatically chooses a sane value for `-j` automatically, and if something goes wrong it will print the full compiler invocation. Otherwise, `ninja` behaves just like `make`. (And is a tad faster.)
130+
Later on, when you `git pull` to get the latest changes, there's (usually) no need to rebuild the toolchain. You can simply run `ninja install`, `ninja image`, and `ninja run` again. CMake will only rebuild those parts that have been updated.
142131

143132
#### Ports
144133
To add a package from the ports collection to Serenity, for example curl, go into `Ports/curl/` and run **./package.sh**. The sourcecode for the package will be downloaded and the package will be built. After that, run **make image** from the `Build/` directory to update the disk image. The next time you start Serenity with **make run**, `curl` will be available.

0 commit comments

Comments
 (0)