Skip to content

Commit

Permalink
cleanup: Add dep name in the log message file path on macOS.
Browse files Browse the repository at this point in the history
Slightly nicer log messages this way, showing which dep a message comes
from.
  • Loading branch information
iphydf committed Dec 26, 2024
1 parent b4b0d8c commit 5d10209
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 18 deletions.
26 changes: 13 additions & 13 deletions .ci-scripts/build-macos-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"
. "$SCRIPT_DIR/macos_install_deps.sh"

install_deps \
build_openssl.sh \
build_qrencode.sh \
build_libexif.sh \
build_sodium.sh \
build_openal.sh \
build_vpx.sh \
build_opus.sh \
build_ffmpeg.sh \
build_sqlcipher.sh \
build_hunspell.sh \
build_extra_cmake_modules.sh \
build_sonnet.sh \
build_toxcore.sh
openssl \
qrencode \
libexif \
sodium \
openal \
vpx \
opus \
ffmpeg \
sqlcipher \
hunspell \
extra_cmake_modules \
sonnet \
toxcore
2 changes: 1 addition & 1 deletion .ci-scripts/build-macos-qt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

# Needs openssl from build-macos-deps.sh to already have been installed.
install_deps \
build_qt_macos.sh
qt
13 changes: 9 additions & 4 deletions .ci-scripts/macos_install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ ARCH="$1"

install_deps() {
for dep in "$@"; do
mkdir -p _build-dep
pushd _build-dep
"$SCRIPT_DIR/dockerfiles/qtox/$dep" --arch "macos-$ARCH" --libtype "static"
mkdir -p "external/$dep"
pushd "external/$dep"
if [ -f "$SCRIPT_DIR/dockerfiles/qtox/build_${dep}_macos.sh" ]; then
SCRIPT="$SCRIPT_DIR/dockerfiles/qtox/build_${dep}_macos.sh"
else
SCRIPT="$SCRIPT_DIR/dockerfiles/qtox/build_$dep.sh"
fi
"$SCRIPT" --arch "macos-$ARCH" --libtype "static"
popd
rm -rf _build-dep
rm -rf "external/$dep"
done
}

0 comments on commit 5d10209

Please sign in to comment.