diff --git a/docker-build/Dockerfile.linux-x86_64 b/docker-build/Dockerfile.linux-x86_64 index 85d7dd5..a10a2ee 100644 --- a/docker-build/Dockerfile.linux-x86_64 +++ b/docker-build/Dockerfile.linux-x86_64 @@ -5,6 +5,8 @@ ENV DEBIAN_FRONTEND=noninteractive TZ=UTC RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential libtool autotools-dev automake autoconf pkg-config \ bsdmainutils python3 curl ca-certificates git unzip zip file rsync \ + libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools qtbase5-dev \ + libqrencode-dev libzmq3-dev libminiupnpc-dev \ && rm -rf /var/lib/apt/lists/* WORKDIR /src diff --git a/docker-build/build-linux-aarch64.sh b/docker-build/build-linux-aarch64.sh index 39c51dd..8534d34 100755 --- a/docker-build/build-linux-aarch64.sh +++ b/docker-build/build-linux-aarch64.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LC_ALL=C set -euo pipefail IMAGE_NAME="palladium-builder:linux-aarch64-ubuntu20.04" @@ -28,6 +29,12 @@ docker run --rm --platform=linux/amd64 \ set -euo pipefail cd /src + echo '[*] cleaning tree (avoid host-built artifacts)...' + [[ -f Makefile ]] && make distclean || true + rm -rf univalue/.libs + rm -rf depends/${HOST_TRIPLE} + rm -f config.cache + echo '[*] depends (HOST=${HOST_TRIPLE})...' cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd .. @@ -35,7 +42,11 @@ docker run --rm --platform=linux/amd64 \ [[ -x ./autogen.sh ]] && ./autogen.sh [[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; } + # Ensure we use Qt tools (moc/uic/rcc) from depends, not system Qt + export PATH=\$PWD/depends/${HOST_TRIPLE}/bin:\$PATH + ./configure --prefix=\$PWD/depends/${HOST_TRIPLE} \ + --with-qt-bindir=\$PWD/depends/${HOST_TRIPLE}/bin \ --host=${HOST_TRIPLE} \ --enable-glibc-back-compat \ --enable-reduce-exports \ diff --git a/docker-build/build-linux-armv7l.sh b/docker-build/build-linux-armv7l.sh index ebc2e76..3927a66 100755 --- a/docker-build/build-linux-armv7l.sh +++ b/docker-build/build-linux-armv7l.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LC_ALL=C set -euo pipefail IMAGE_NAME="palladium-builder:linux-armv7l-ubuntu20.04" @@ -27,6 +28,12 @@ docker run --rm --platform=linux/amd64 \ set -euo pipefail cd /src + echo '[*] cleaning tree (avoid host-built artifacts)...' + [[ -f Makefile ]] && make distclean || true + rm -rf univalue/.libs + rm -rf depends/${HOST_TRIPLE} + rm -f config.cache + echo '[*] depends (HOST=${HOST_TRIPLE})...' cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd .. @@ -34,7 +41,11 @@ docker run --rm --platform=linux/amd64 \ [[ -x ./autogen.sh ]] && ./autogen.sh [[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; } + # Ensure we use Qt tools (moc/uic/rcc) from depends, not system Qt + export PATH=\$PWD/depends/${HOST_TRIPLE}/bin:\$PATH + ./configure --prefix=\$PWD/depends/${HOST_TRIPLE} \ + --with-qt-bindir=\$PWD/depends/${HOST_TRIPLE}/bin \ --host=${HOST_TRIPLE} \ --enable-glibc-back-compat \ --enable-reduce-exports \ diff --git a/docker-build/build-linux-x86_64.sh b/docker-build/build-linux-x86_64.sh index 598e255..bb29b47 100755 --- a/docker-build/build-linux-x86_64.sh +++ b/docker-build/build-linux-x86_64.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LC_ALL=C set -euo pipefail IMAGE_NAME="palladium-builder:linux-x86_64-ubuntu20.04" @@ -28,6 +29,12 @@ docker run --rm --platform=linux/amd64 \ set -euo pipefail cd /src + echo '[*] cleaning tree (avoid host-built artifacts)...' + [[ -f Makefile ]] && make distclean || true + rm -rf univalue/.libs + rm -rf depends/${HOST_TRIPLE} + rm -f config.cache + echo '[*] depends...' cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd .. @@ -35,7 +42,11 @@ docker run --rm --platform=linux/amd64 \ [[ -x ./autogen.sh ]] && ./autogen.sh [[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; } + # Ensure we use Qt tools (moc/uic/rcc) from depends, not system Qt + export PATH=\$PWD/depends/${HOST_TRIPLE}/bin:\$PATH + ./configure --prefix=\$PWD/depends/${HOST_TRIPLE} \ + --with-qt-bindir=\$PWD/depends/${HOST_TRIPLE}/bin \ --enable-glibc-back-compat \ --enable-reduce-exports \ LDFLAGS='-static-libstdc++' @@ -55,4 +66,4 @@ docker run --rm --platform=linux/amd64 \ echo '[*] build COMPLETED (everything in container) → /out' " -echo "[*] Binaries available in: ${OUT_DIR}" \ No newline at end of file +echo "[*] Binaries available in: ${OUT_DIR}" diff --git a/docker-build/build-menu.sh b/docker-build/build-menu.sh index 0456f0b..53c2d4d 100755 --- a/docker-build/build-menu.sh +++ b/docker-build/build-menu.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LC_ALL=C set -euo pipefail # Directory where this script is located diff --git a/docker-build/build-windows.sh b/docker-build/build-windows.sh index 284a372..d9c8293 100755 --- a/docker-build/build-windows.sh +++ b/docker-build/build-windows.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export LC_ALL=C set -euo pipefail # Default to not building the installer @@ -38,6 +39,14 @@ docker run --rm --platform=linux/amd64 \ set -euo pipefail cd /src + echo '[*] cleaning tree (avoid host-built artifacts)...' + [[ -f Makefile ]] && make distclean || true + (cd univalue && make distclean) || true + rm -rf univalue/.libs univalue/lib/.libs + rm -f univalue/config.cache univalue/config.status + rm -rf depends/${HOST_TRIPLE} + rm -f config.cache + echo '[*] depends (Windows cross, HOST=${HOST_TRIPLE})...' cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd .. @@ -77,4 +86,4 @@ docker run --rm --platform=linux/amd64 \ echo '[*] build COMPLETED (everything in container) → /out' " -echo "[*] Windows executables available in: ${OUT_DIR}" \ No newline at end of file +echo "[*] Windows executables available in: ${OUT_DIR}" diff --git a/quick-build.sh b/quick-build.sh index ff9acc3..ea191c0 100755 --- a/quick-build.sh +++ b/quick-build.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash +export LC_ALL=C ############################################################################### # Quick Build Script for Palladium Core diff --git a/update_version.sh b/update_version.sh index 22faf6d..66f72eb 100755 --- a/update_version.sh +++ b/update_version.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash +export LC_ALL=C set -e echo "========================================================"