mirror of
https://github.com/FeralInteractive/gamemode.git
synced 2025-06-06 07:37:21 +02:00
meson: use builddir instead of build
Use the -C option instead of changing the dir, change the build folder to builddir. Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
This commit is contained in:
parent
ce6485ef97
commit
115f1ecdbd
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
build/
|
||||
builddir/
|
||||
*.swp
|
||||
|
@ -19,6 +19,6 @@ addons:
|
||||
script:
|
||||
- ./scripts/format-check.sh
|
||||
- ./bootstrap.sh -Dwith-examples=true
|
||||
- meson test -C build
|
||||
- meson test -C builddir
|
||||
- dbus-run-session -- gamemode-simulate-game
|
||||
- ./scripts/static-analyser-check.sh
|
||||
|
@ -119,8 +119,7 @@ git checkout 1.5.1 # omit to build the master branch
|
||||
To uninstall:
|
||||
```bash
|
||||
systemctl --user stop gamemoded.service
|
||||
cd build/
|
||||
ninja uninstall
|
||||
ninja uninstall -C builddir
|
||||
```
|
||||
|
||||
### Pull Requests
|
||||
|
@ -26,9 +26,8 @@ fi
|
||||
|
||||
# Echo the rest so it's obvious
|
||||
set -x
|
||||
meson --prefix=$prefix build --buildtype debugoptimized -Dwith-systemd-user-unit-dir=/etc/systemd/user "$@"
|
||||
cd build
|
||||
ninja
|
||||
meson builddir --prefix=$prefix --buildtype debugoptimized -Dwith-systemd-user-unit-dir=/etc/systemd/user "$@"
|
||||
ninja -C builddir
|
||||
|
||||
# Verify user wants to install
|
||||
set +x
|
||||
@ -38,7 +37,7 @@ if [ "$TRAVIS" != "true" ]; then
|
||||
fi
|
||||
set -x
|
||||
|
||||
sudo ninja install
|
||||
sudo ninja install -C builddir
|
||||
|
||||
# Restart polkit so we don't get pop-ups whenever we pkexec
|
||||
if systemctl list-unit-files |grep -q polkit.service; then
|
||||
|
@ -3,11 +3,8 @@
|
||||
# Exit on failure
|
||||
set -e
|
||||
|
||||
# Build directly
|
||||
cd build/
|
||||
|
||||
# Collect scan-build output
|
||||
ninja scan-build | tee /tmp/scan-build-results.txt
|
||||
ninja scan-build -C builddir | tee /tmp/scan-build-results.txt
|
||||
|
||||
# Invert the output - if this string exists it's a fail
|
||||
! grep -E '[0-9]+ bugs? found.' /tmp/scan-build-results.txt
|
||||
|
Loading…
x
Reference in New Issue
Block a user