servius/helvum
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/helvum synced 2026-03-15 03:26:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: fix and improve cargo.sh

Browse Source 
cargo.sh previously used bash features but only used `sh` in the shebang,
and also did not properly quote some variables to avoid splitting/globbing from happening.

Also, `-euo pilefail` is now set to avoid other errors that might come up.
This commit is contained in:
Tom A. Wagner
2021-10-26 10:01:01 +02:00
parent 729d4e1555
commit 7b1b5ea336
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build-aux/cargo.sh
View File

@@ -1,4 +1,6 @@
#!/bin/sh #!/bin/bash
set -euo pipefail
export MESON_BUILD_ROOT="$1" export MESON_BUILD_ROOT="$1"
export MESON_SOURCE_ROOT="$2" export MESON_SOURCE_ROOT="$2"
@@ -9,12 +11,11 @@ if [[ $4 = "development" ]]
then then
echo "DEBUG MODE" echo "DEBUG MODE"
cargo build --manifest-path \ cargo build --manifest-path \
"$MESON_SOURCE_ROOT"/Cargo.toml && \ "$MESON_SOURCE_ROOT/Cargo.toml" && \
cp "$CARGO_TARGET_DIR"/debug/$5 $3 cp "$CARGO_TARGET_DIR/debug/$5" "$3"
else else
echo "RELEASE MODE" echo "RELEASE MODE"
cargo build --manifest-path \ cargo build --manifest-path \
"$MESON_SOURCE_ROOT"/Cargo.toml --release && \ "$MESON_SOURCE_ROOT/Cargo.toml" --release && \
cp "$CARGO_TARGET_DIR"/release/$5 $3 cp "$CARGO_TARGET_DIR/release/$5" "$3"
fi fi