From bfe708833b50ae749bcf62ed29de705de53941d6 Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 8 Jan 2025 23:42:06 +0000 Subject: [PATCH] cleanup: Unify Qt submodule builds for macos/win/linux. --- qtox/build_qtbase_linux.sh | 7 +- qtox/build_qtbase_macos.sh | 9 +-- qtox/build_qtbase_windows.sh | 5 +- ...ats_windows.sh => build_qtimageformats.sh} | 6 +- qtox/build_qtimageformats_linux.sh | 28 ------- qtox/build_qtimageformats_macos.sh | 28 ------- qtox/build_qtremoteobjects.sh | 23 ++++++ qtox/{build_qtsvg_linux.sh => build_qtsvg.sh} | 10 +-- qtox/build_qtsvg_macos.sh | 28 ------- qtox/build_qtsvg_windows.sh | 25 ------- ...ld_qttools_windows.sh => build_qttools.sh} | 6 +- qtox/build_qttools_linux.sh | 35 --------- qtox/build_qttools_macos.sh | 38 ---------- qtox/build_qtwayland_linux.sh | 4 +- qtox/docker/Dockerfile.alpine | 2 +- qtox/docker/Dockerfile.alpine-appimage | 68 ++++++++--------- qtox/docker/Dockerfile.alpine-static | 3 + qtox/docker/Dockerfile.android-builder | 2 +- qtox/docker/Dockerfile.archlinux | 12 +-- qtox/docker/Dockerfile.debian | 11 +-- qtox/docker/Dockerfile.fedora | 9 ++- qtox/docker/Dockerfile.host-qt | 2 +- qtox/docker/Dockerfile.ubuntu-lts | 15 ++-- qtox/docker/Dockerfile.windows-builder | 73 +++++++++---------- qtox/download/download_qtbase.sh | 9 +-- qtox/download/download_qtimageformats.sh | 9 +-- qtox/download/download_qtremoteobjects.sh | 18 +++++ qtox/download/download_qtsvg.sh | 9 +-- qtox/download/download_qttools.sh | 9 +-- qtox/download/download_qtwayland.sh | 9 +-- 30 files changed, 178 insertions(+), 334 deletions(-) rename qtox/{build_qtimageformats_windows.sh => build_qtimageformats.sh} (74%) delete mode 100755 qtox/build_qtimageformats_linux.sh delete mode 100755 qtox/build_qtimageformats_macos.sh create mode 100755 qtox/build_qtremoteobjects.sh rename qtox/{build_qtsvg_linux.sh => build_qtsvg.sh} (59%) delete mode 100755 qtox/build_qtsvg_macos.sh delete mode 100755 qtox/build_qtsvg_windows.sh rename qtox/{build_qttools_windows.sh => build_qttools.sh} (81%) delete mode 100755 qtox/build_qttools_linux.sh delete mode 100755 qtox/build_qttools_macos.sh create mode 100755 qtox/download/download_qtremoteobjects.sh diff --git a/qtox/build_qtbase_linux.sh b/qtox/build_qtbase_linux.sh index 0052e44..360b859 100755 --- a/qtox/build_qtbase_linux.sh +++ b/qtox/build_qtbase_linux.sh @@ -16,9 +16,10 @@ parse_arch --dep "qtbase" --supported "linux-x86_64" "$@" export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" export OBJCXXFLAGS="$CXXFLAGS" -mkdir -p qtbase/_build -pushd qtbase/_build -../configure -prefix "$DEP_PREFIX/qt" \ +mkdir -p _build +pushd _build +../configure \ + -prefix "$QT_PREFIX" \ -appstore-compliant \ -release \ "-$LIB_TYPE" \ diff --git a/qtox/build_qtbase_macos.sh b/qtox/build_qtbase_macos.sh index 61c52db..24a5206 100755 --- a/qtox/build_qtbase_macos.sh +++ b/qtox/build_qtbase_macos.sh @@ -12,6 +12,8 @@ source "$SCRIPT_DIR/download/version_qt.sh" parse_arch --dep "qtbase" --supported "macos-arm64 macos-x86_64" "$@" +"$SCRIPT_DIR/download/download_qtbase.sh" + export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" export OBJCXXFLAGS="$CXXFLAGS" @@ -28,9 +30,7 @@ else QT_FORCE_DEBUG_INFO="-no-force-debug-info" fi -tar Jxf <(curl -L "https://download.qt.io/archive/qt/$(echo "$QT_VERSION" | grep -o '...')/$QT_VERSION/submodules/qtbase-everywhere-src-$QT_VERSION.tar.xz") -rm -rf qtbase && mv "qtbase-everywhere-src-$QT_VERSION" qtbase && cd qtbase -rm -rf _build && mkdir _build && cd _build +mkdir _build && pushd _build ../configure \ --prefix="$QT_PREFIX" \ -appstore-compliant \ @@ -61,5 +61,4 @@ rm -rf _build && mkdir _build && cd _build cat config.summary cmake --build . cmake --install . -cd ../.. -rm -rf qtbase +popd diff --git a/qtox/build_qtbase_windows.sh b/qtox/build_qtbase_windows.sh index fb96fb6..d45b221 100755 --- a/qtox/build_qtbase_windows.sh +++ b/qtox/build_qtbase_windows.sh @@ -18,8 +18,9 @@ parse_arch --dep "qt" --supported "win32 win64" "$@" CROSS_COMPILE="$MINGW_ARCH-w64-mingw32-" "${CROSS_COMPILE}gcc" --version -mkdir qtbase/_build && pushd qtbase/_build -../configure -prefix "$DEP_PREFIX" \ +mkdir _build && pushd _build +../configure \ + -prefix "$QT_PREFIX" \ -appstore-compliant \ -release \ -shared \ diff --git a/qtox/build_qtimageformats_windows.sh b/qtox/build_qtimageformats.sh similarity index 74% rename from qtox/build_qtimageformats_windows.sh rename to qtox/build_qtimageformats.sh index a3cb2b7..e694ada 100755 --- a/qtox/build_qtimageformats_windows.sh +++ b/qtox/build_qtimageformats.sh @@ -11,12 +11,12 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" source "$SCRIPT_DIR/build_utils.sh" -parse_arch --dep "qt" --supported "win32 win64" "$@" +parse_arch --dep "qtimageformats" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@" "$SCRIPT_DIR/download/download_qtimageformats.sh" -mkdir qtimageformats/_build && pushd qtimageformats/_build -"$DEP_PREFIX/bin/qt-configure-module" .. \ +mkdir _build && pushd _build +"$QT_PREFIX/bin/qt-configure-module" .. \ -- \ -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \ -Wno-dev diff --git a/qtox/build_qtimageformats_linux.sh b/qtox/build_qtimageformats_linux.sh deleted file mode 100755 index 7c333ee..0000000 --- a/qtox/build_qtimageformats_linux.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team - -set -euxo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "$SCRIPT_DIR/build_utils.sh" - -parse_arch --dep "qtimageformats" --supported "linux-x86_64" "$@" - -"$SCRIPT_DIR/download/download_qtimageformats.sh" - -export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" -export OBJCXXFLAGS="$CXXFLAGS" - -mkdir qtimageformats/_build && pushd qtimageformats/_build -"$DEP_PREFIX/qt/bin/qt-configure-module" .. \ - -no-feature-jasper \ - -no-feature-mng \ - -no-feature-tiff \ - -- \ - -Wno-dev -cmake --build . -cmake --install . -popd diff --git a/qtox/build_qtimageformats_macos.sh b/qtox/build_qtimageformats_macos.sh deleted file mode 100755 index b1b633f..0000000 --- a/qtox/build_qtimageformats_macos.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team - -set -euxo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "$SCRIPT_DIR/build_utils.sh" -source "$SCRIPT_DIR/download/version_qt.sh" - -parse_arch --dep "qtimageformats" --supported "macos-arm64 macos-x86_64" "$@" - -export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" -export OBJCXXFLAGS="$CXXFLAGS" - -tar Jxf <(curl -L "https://download.qt.io/archive/qt/$(echo "$QT_VERSION" | grep -o '...')/$QT_VERSION/submodules/qtimageformats-everywhere-src-$QT_VERSION.tar.xz") -rm -rf qtimageformats && mv "qtimageformats-everywhere-src-$QT_VERSION" qtimageformats && cd qtimageformats -rm -rf _build && mkdir _build && cd _build -"$QT_PREFIX/bin/qt-configure-module" .. \ - -- \ - -DCMAKE_FIND_ROOT_PATH="$DEP_PREFIX" \ - -Wno-dev -cmake --build . -cmake --install . -cd ../.. -rm -rf qtimageformats diff --git a/qtox/build_qtremoteobjects.sh b/qtox/build_qtremoteobjects.sh new file mode 100755 index 0000000..054600d --- /dev/null +++ b/qtox/build_qtremoteobjects.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright © 2024-2025 The TokTok team + +set -euxo pipefail + +readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" + +source "$SCRIPT_DIR/build_utils.sh" + +parse_arch --dep "qtremoteobjects" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@" + +"$SCRIPT_DIR/download/download_qtremoteobjects.sh" + +mkdir _build && pushd _build +"$QT_PREFIX/bin/qt-configure-module" .. \ + -- \ + -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \ + -Wno-dev +cmake --build . +cmake --install . +popd diff --git a/qtox/build_qtsvg_linux.sh b/qtox/build_qtsvg.sh similarity index 59% rename from qtox/build_qtsvg_linux.sh rename to qtox/build_qtsvg.sh index c5954c1..f9784ee 100755 --- a/qtox/build_qtsvg_linux.sh +++ b/qtox/build_qtsvg.sh @@ -9,16 +9,14 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" source "$SCRIPT_DIR/build_utils.sh" -parse_arch --dep "qtsvg" --supported "linux-x86_64" "$@" +parse_arch --dep "qtsvg" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@" "$SCRIPT_DIR/download/download_qtsvg.sh" -export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" -export OBJCXXFLAGS="$CXXFLAGS" - -mkdir qtsvg/_build && pushd qtsvg/_build -"$DEP_PREFIX/qt/bin/qt-configure-module" .. \ +mkdir _build && pushd _build +"$QT_PREFIX/bin/qt-configure-module" .. \ -- \ + -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \ -Wno-dev cmake --build . cmake --install . diff --git a/qtox/build_qtsvg_macos.sh b/qtox/build_qtsvg_macos.sh deleted file mode 100755 index f493d5d..0000000 --- a/qtox/build_qtsvg_macos.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team - -set -euxo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "$SCRIPT_DIR/build_utils.sh" -source "$SCRIPT_DIR/download/version_qt.sh" - -parse_arch --dep "qtsvg" --supported "macos-arm64 macos-x86_64" "$@" - -export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" -export OBJCXXFLAGS="$CXXFLAGS" - -tar Jxf <(curl -L "https://download.qt.io/archive/qt/$(echo "$QT_VERSION" | grep -o '...')/$QT_VERSION/submodules/qtsvg-everywhere-src-$QT_VERSION.tar.xz") -rm -rf qtsvg && mv "qtsvg-everywhere-src-$QT_VERSION" qtsvg && cd qtsvg -rm -rf _build && mkdir _build && cd _build -"$QT_PREFIX/bin/qt-configure-module" .. \ - -- \ - -DCMAKE_FIND_ROOT_PATH="$DEP_PREFIX" \ - -Wno-dev -cmake --build . -cmake --install . -cd ../.. -rm -rf qtsvg diff --git a/qtox/build_qtsvg_windows.sh b/qtox/build_qtsvg_windows.sh deleted file mode 100755 index ee0ae4c..0000000 --- a/qtox/build_qtsvg_windows.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-License-Identifier: GPL-3.0-or-later AND MIT -# Copyright © 2017-2021 Maxim Biro -# Copyright © 2021 by The qTox Project Contributors -# Copyright © 2024-2025 The TokTok team - -set -euxo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "$SCRIPT_DIR/build_utils.sh" - -parse_arch --dep "qt" --supported "win32 win64" "$@" - -"$SCRIPT_DIR/download/download_qtsvg.sh" - -mkdir qtsvg/_build && pushd qtsvg/_build -"$DEP_PREFIX/bin/qt-configure-module" .. \ - -- \ - -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \ - -Wno-dev -cmake --build . -cmake --install . -popd diff --git a/qtox/build_qttools_windows.sh b/qtox/build_qttools.sh similarity index 81% rename from qtox/build_qttools_windows.sh rename to qtox/build_qttools.sh index 3aa9e14..cac5605 100755 --- a/qtox/build_qttools_windows.sh +++ b/qtox/build_qttools.sh @@ -11,12 +11,12 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" source "$SCRIPT_DIR/build_utils.sh" -parse_arch --dep "qt" --supported "win32 win64" "$@" +parse_arch --dep "qttools" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@" "$SCRIPT_DIR/download/download_qttools.sh" -mkdir qttools/_build && pushd qttools/_build -"$DEP_PREFIX/bin/qt-configure-module" .. \ +mkdir _build && pushd _build +"$QT_PREFIX/bin/qt-configure-module" .. \ -no-feature-assistant \ -no-feature-designer \ -no-feature-kmap2qmap \ diff --git a/qtox/build_qttools_linux.sh b/qtox/build_qttools_linux.sh deleted file mode 100755 index 5f7a769..0000000 --- a/qtox/build_qttools_linux.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team - -set -euxo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "$SCRIPT_DIR/build_utils.sh" - -parse_arch --dep "qttools" --supported "linux-x86_64" "$@" - -"$SCRIPT_DIR/download/download_qttools.sh" - -export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" -export OBJCXXFLAGS="$CXXFLAGS" - -mkdir qttools/_build && pushd qttools/_build -"$DEP_PREFIX/qt/bin/qt-configure-module" .. \ - -no-feature-assistant \ - -no-feature-designer \ - -no-feature-kmap2qmap \ - -no-feature-pixeltool \ - -no-feature-qdbus \ - -no-feature-qdoc \ - -no-feature-qev \ - -no-feature-qtattributionsscanner \ - -no-feature-qtdiag \ - -no-feature-qtplugininfo \ - -- \ - -Wno-dev -cmake --build . -cmake --install . -popd diff --git a/qtox/build_qttools_macos.sh b/qtox/build_qttools_macos.sh deleted file mode 100755 index 1c61124..0000000 --- a/qtox/build_qttools_macos.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team - -set -euxo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "$SCRIPT_DIR/build_utils.sh" -source "$SCRIPT_DIR/download/version_qt.sh" - -parse_arch --dep "qttools" --supported "macos-arm64 macos-x86_64" "$@" - -export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" -export OBJCXXFLAGS="$CXXFLAGS" - -tar Jxf <(curl -L "https://download.qt.io/archive/qt/$(echo "$QT_VERSION" | grep -o '...')/$QT_VERSION/submodules/qttools-everywhere-src-$QT_VERSION.tar.xz") -rm -rf qttools && mv "qttools-everywhere-src-$QT_VERSION" qttools && cd qttools -rm -rf _build && mkdir _build && cd _build -"$QT_PREFIX/bin/qt-configure-module" .. \ - -no-feature-assistant \ - -no-feature-designer \ - -no-feature-kmap2qmap \ - -no-feature-pixeltool \ - -no-feature-qdbus \ - -no-feature-qdoc \ - -no-feature-qev \ - -no-feature-qtattributionsscanner \ - -no-feature-qtdiag \ - -no-feature-qtplugininfo \ - -- \ - -DCMAKE_FIND_ROOT_PATH="$DEP_PREFIX" \ - -Wno-dev -cmake --build . -cmake --install . -cd ../.. -rm -rf qttools diff --git a/qtox/build_qtwayland_linux.sh b/qtox/build_qtwayland_linux.sh index 62efe2f..0665893 100755 --- a/qtox/build_qtwayland_linux.sh +++ b/qtox/build_qtwayland_linux.sh @@ -16,8 +16,8 @@ parse_arch --dep "qtwayland" --supported "linux-x86_64" "$@" export CXXFLAGS="-DQT_MESSAGELOGCONTEXT" export OBJCXXFLAGS="$CXXFLAGS" -mkdir qtwayland/_build && pushd qtwayland/_build -"$DEP_PREFIX/qt/bin/qt-configure-module" .. \ +mkdir _build && pushd _build +"$QT_PREFIX/bin/qt-configure-module" .. \ -- \ -Wno-dev cmake --build . diff --git a/qtox/docker/Dockerfile.alpine b/qtox/docker/Dockerfile.alpine index da1deea..5c663f4 100644 --- a/qtox/docker/Dockerfile.alpine +++ b/qtox/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2024-2025 The TokTok team FROM alpine:3.20 diff --git a/qtox/docker/Dockerfile.alpine-appimage b/qtox/docker/Dockerfile.alpine-appimage index e57e034..f1b53ed 100644 --- a/qtox/docker/Dockerfile.alpine-appimage +++ b/qtox/docker/Dockerfile.alpine-appimage @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2024-2025 The TokTok team FROM alpine:3.21 @@ -50,70 +50,70 @@ COPY download/version_qt.sh /build/download/ COPY download/download_qtbase.sh /build/download/ COPY build_qtbase_linux.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ +RUN mkdir -p /src/qtbase \ + && cd /src/qtbase \ && /build/build_qtbase_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/qt + && rm -fr /src/qtbase COPY download/download_qttools.sh /build/download/ -COPY build_qttools_linux.sh /build/ +COPY build_qttools.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ - && /build/build_qttools_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/qt +RUN mkdir -p /src/qttools \ + && cd /src/qttools \ + && /build/build_qttools.sh --arch "$SCRIPT_ARCH" --libtype shared \ + && rm -fr /src/qttools COPY download/download_qtsvg.sh /build/download/ -COPY build_qtsvg_linux.sh /build/ +COPY build_qtsvg.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ - && /build/build_qtsvg_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/qt +RUN mkdir -p /src/qtsvg \ + && cd /src/qtsvg \ + && /build/build_qtsvg.sh --arch "$SCRIPT_ARCH" --libtype shared \ + && rm -fr /src/qtsvg COPY download/download_qtimageformats.sh /build/download/ -COPY build_qtimageformats_linux.sh /build/ +COPY build_qtimageformats.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ - && /build/build_qtimageformats_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/qt +RUN mkdir -p /src/qtimageformats \ + && cd /src/qtimageformats \ + && /build/build_qtimageformats.sh --arch "$SCRIPT_ARCH" --libtype shared \ + && rm -fr /src/qtimageformats COPY download/download_qtwayland.sh /build/download/ COPY build_qtwayland_linux.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ +RUN mkdir -p /src/qtwayland \ + && cd /src/qtwayland \ && /build/build_qtwayland_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/qt + && rm -fr /src/qtwayland COPY download/download_extra_cmake_modules.sh /build/download/ COPY build_extra_cmake_modules.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/ecm \ + && cd /src/ecm \ && /build/build_extra_cmake_modules.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/tox + && rm -fr /src/ecm COPY download/download_sonnet.sh /build/download/ COPY build_sonnet.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/sonnet \ + && cd /src/sonnet \ && /build/build_sonnet.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/tox + && rm -fr /src/sonnet COPY download/download_kimageformats.sh /build/download/ COPY build_kimageformats.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/kimageformats \ + && cd /src/kimageformats \ && /build/build_kimageformats.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/tox + && rm -fr /src/kimageformats COPY download/download_toxcore.sh /build/download/ COPY build_toxcore.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/toxcore \ + && cd /src/toxcore \ && /build/build_toxcore.sh --arch "$SCRIPT_ARCH" --libtype shared \ - && rm -fr /src/tox + && rm -fr /src/toxcore # We're selective about KDE image format plugins for security reasons. We only # include the ones we've tested (e.g. with fuzzing). diff --git a/qtox/docker/Dockerfile.alpine-static b/qtox/docker/Dockerfile.alpine-static index ef6de98..23f132a 100644 --- a/qtox/docker/Dockerfile.alpine-static +++ b/qtox/docker/Dockerfile.alpine-static @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright © 2024-2025 The TokTok team + FROM alpine:edge AS common RUN ["apk", "add", \ diff --git a/qtox/docker/Dockerfile.android-builder b/qtox/docker/Dockerfile.android-builder index 26aa01e..fc2373b 100644 --- a/qtox/docker/Dockerfile.android-builder +++ b/qtox/docker/Dockerfile.android-builder @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2024-2025 The TokTok team ARG QT_VERSION=6.2.4 diff --git a/qtox/docker/Dockerfile.archlinux b/qtox/docker/Dockerfile.archlinux index 78ccaf4..123f263 100644 --- a/qtox/docker/Dockerfile.archlinux +++ b/qtox/docker/Dockerfile.archlinux @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2021 by The qTox Project Contributors # Copyright © 2024-2025 The TokTok team @@ -27,12 +27,14 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig COPY download/common.sh /build/download/common.sh COPY build_utils.sh /build/build_utils.sh + COPY download/download_toxcore.sh /build/download/download_toxcore.sh COPY build_toxcore_system.sh /build/build_toxcore_system.sh -RUN mkdir -p /src/tox && \ - cd /src/tox && \ - /build/build_toxcore_system.sh && \ - rm -fr /src/tox + +RUN mkdir -p /src/toxcore \ + && cd /src/toxcore \ + && /build/build_toxcore_system.sh \ + && rm -fr /src/toxcore WORKDIR /qtox ENV HOME=/qtox diff --git a/qtox/docker/Dockerfile.debian b/qtox/docker/Dockerfile.debian index c2fbfab..42de907 100644 --- a/qtox/docker/Dockerfile.debian +++ b/qtox/docker/Dockerfile.debian @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2021 by The qTox Project Contributors # Copyright © 2024-2025 The TokTok team @@ -39,10 +39,11 @@ COPY build_utils.sh /build/build_utils.sh COPY download/download_toxcore.sh /build/download/download_toxcore.sh COPY build_toxcore_system.sh /build/build_toxcore_system.sh -RUN mkdir -p /src/tox && \ - cd /src/tox && \ - /build/build_toxcore_system.sh && \ - rm -fr /src/tox + +RUN mkdir -p /src/toxcore \ + && cd /src/toxcore \ + && /build/build_toxcore_system.sh \ + && rm -fr /src/toxcore WORKDIR /qtox ENV HOME=/qtox diff --git a/qtox/docker/Dockerfile.fedora b/qtox/docker/Dockerfile.fedora index fce3f36..21a3143 100644 --- a/qtox/docker/Dockerfile.fedora +++ b/qtox/docker/Dockerfile.fedora @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2021 by The qTox Project Contributors # Copyright © 2024-2025 The TokTok team @@ -43,10 +43,11 @@ COPY build_utils.sh /build/build_utils.sh COPY download/download_toxcore.sh /build/download/download_toxcore.sh COPY build_toxcore_system.sh /build/build_toxcore_system.sh -RUN mkdir -p /src/tox \ - && cd /src/tox \ + +RUN mkdir -p /src/toxcore \ + && cd /src/toxcore \ && /build/build_toxcore_system.sh \ - && rm -fr /src/tox + && rm -fr /src/toxcore RUN echo '/usr/local/lib64/' >> /etc/ld.so.conf.d/locallib.conf \ && ldconfig diff --git a/qtox/docker/Dockerfile.host-qt b/qtox/docker/Dockerfile.host-qt index 8e62de8..0251272 100644 --- a/qtox/docker/Dockerfile.host-qt +++ b/qtox/docker/Dockerfile.host-qt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2024-2025 The TokTok team # Build Qt for the host system. diff --git a/qtox/docker/Dockerfile.ubuntu-lts b/qtox/docker/Dockerfile.ubuntu-lts index efadbc2..08fbfcb 100644 --- a/qtox/docker/Dockerfile.ubuntu-lts +++ b/qtox/docker/Dockerfile.ubuntu-lts @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-or-later. +# SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2019-2021 by The qTox Project Contributors # Copyright © 2024-2025 The TokTok team @@ -47,13 +47,14 @@ COPY build_utils.sh /build/build_utils.sh COPY download/download_toxcore.sh /build/download/download_toxcore.sh COPY build_toxcore_system.sh /build/build_toxcore_system.sh -RUN mkdir -p /src/tox && \ - cd /src/tox && \ - /build/build_toxcore_system.sh && \ - rm -fr /src/tox -RUN echo '/usr/local/lib/' >> /etc/ld.so.conf.d/locallib.conf && \ - ldconfig +RUN mkdir -p /src/toxcore \ + && cd /src/toxcore \ + && /build/build_toxcore_system.sh \ + && rm -fr /src/toxcore + +RUN echo '/usr/local/lib/' >> /etc/ld.so.conf.d/locallib.conf \ + && ldconfig WORKDIR /qtox ENV HOME=/qtox diff --git a/qtox/docker/Dockerfile.windows-builder b/qtox/docker/Dockerfile.windows-builder index bc58f93..e8d98e1 100644 --- a/qtox/docker/Dockerfile.windows-builder +++ b/qtox/docker/Dockerfile.windows-builder @@ -124,19 +124,12 @@ RUN mkdir -p /src/vpx \ && /build/build_vpx.sh --arch "$SCRIPT_ARCH" \ && rm -fr /src/vpx -COPY download/download_extra_cmake_modules.sh /build/download/ -COPY build_extra_cmake_modules.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ - && /build/build_extra_cmake_modules.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/tox - COPY download/download_toxcore.sh /build/download/ COPY build_toxcore.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/toxcore \ + && cd /src/toxcore \ && /build/build_toxcore.sh \ - && rm -fr /src/tox + && rm -fr /src/toxcore FROM base as debug-export @@ -194,62 +187,62 @@ COPY download/version_qt.sh /build/download/ COPY download/download_qtbase.sh /build/download/ COPY build_qtbase_windows.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ +RUN mkdir -p /src/qtbase \ + && cd /src/qtbase \ && /build/build_qtbase_windows.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/qt + && rm -fr /src/qtbase COPY download/download_qttools.sh /build/download/ -COPY build_qttools_windows.sh /build/ +COPY build_qttools.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ - && /build/build_qttools_windows.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/qt +RUN mkdir -p /src/qttools \ + && cd /src/qttools \ + && /build/build_qttools.sh --arch "$SCRIPT_ARCH" \ + && rm -fr /src/qttools COPY download/download_qtsvg.sh /build/download/ -COPY build_qtsvg_windows.sh /build/ +COPY build_qtsvg.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ - && /build/build_qtsvg_windows.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/qt +RUN mkdir -p /src/qtsvg \ + && cd /src/qtsvg \ + && /build/build_qtsvg.sh --arch "$SCRIPT_ARCH" \ + && rm -fr /src/qtsvg COPY download/download_qtimageformats.sh /build/download/ -COPY build_qtimageformats_windows.sh /build/ +COPY build_qtimageformats.sh /build/ -RUN mkdir -p /src/qt \ - && cd /src/qt \ - && /build/build_qtimageformats_windows.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/qt +RUN mkdir -p /src/qtimageformats \ + && cd /src/qtimageformats \ + && /build/build_qtimageformats.sh --arch "$SCRIPT_ARCH" \ + && rm -fr /src/qtimageformats COPY download/download_extra_cmake_modules.sh /build/download/ COPY build_extra_cmake_modules.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/ecm \ + && cd /src/ecm \ && /build/build_extra_cmake_modules.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/tox + && rm -fr /src/ecm COPY download/download_hunspell.sh /build/download/ COPY build_hunspell.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/hunspell \ + && cd /src/hunspell \ && /build/build_hunspell.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/tox + && rm -fr /src/hunspell COPY download/download_sonnet.sh /build/download/ COPY build_sonnet.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/sonnet \ + && cd /src/sonnet \ && /build/build_sonnet.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/tox + && rm -fr /src/sonnet COPY download/download_kimageformats.sh /build/download/ COPY build_kimageformats.sh /build/ -RUN mkdir -p /src/tox \ - && cd /src/tox \ +RUN mkdir -p /src/kimageformats \ + && cd /src/kimageformats \ && /build/build_kimageformats.sh --arch "$SCRIPT_ARCH" \ - && rm -fr /src/tox + && rm -fr /src/kimageformats COPY download/download_nsisshellexecasuser.sh /build/download/ COPY build_nsisshellexecasuser_windows.sh /build/ diff --git a/qtox/download/download_qtbase.sh b/qtox/download/download_qtbase.sh index 514f371..a0cd588 100755 --- a/qtox/download/download_qtbase.sh +++ b/qtox/download/download_qtbase.sh @@ -13,9 +13,6 @@ source "$(dirname "$(realpath "$0")")/version_qt.sh" MIRROR=http://master.qt-project.org -( - mkdir qtbase && cd qtbase - download_verify_extract_tarball \ - "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtbase-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ - "$QTBASE_HASH" -) +download_verify_extract_tarball \ + "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtbase-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ + "$QTBASE_HASH" diff --git a/qtox/download/download_qtimageformats.sh b/qtox/download/download_qtimageformats.sh index 6acdfb0..eb96cb5 100755 --- a/qtox/download/download_qtimageformats.sh +++ b/qtox/download/download_qtimageformats.sh @@ -13,9 +13,6 @@ source "$(dirname "$(realpath "$0")")/version_qt.sh" MIRROR=http://master.qt-project.org -( - mkdir qtimageformats && cd qtimageformats - download_verify_extract_tarball \ - "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtimageformats-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ - "$QTIMAGEFORMATS_HASH" -) +download_verify_extract_tarball \ + "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtimageformats-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ + "$QTIMAGEFORMATS_HASH" diff --git a/qtox/download/download_qtremoteobjects.sh b/qtox/download/download_qtremoteobjects.sh new file mode 100755 index 0000000..938a73d --- /dev/null +++ b/qtox/download/download_qtremoteobjects.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright © 2021 by The qTox Project Contributors +# Copyright © 2024-2025 The TokTok team + +set -euo pipefail + +QTREMOTEOBJECTS_HASH=7ef2870f05614b71d1cfdd7ac12acef5294abc43da244a6e9e411f21208f59f8 + +source "$(dirname "$(realpath "$0")")/common.sh" +source "$(dirname "$(realpath "$0")")/version_qt.sh" + +MIRROR=http://master.qt-project.org + +download_verify_extract_tarball \ + "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtremoteobjects-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ + "$QTREMOTEOBJECTS_HASH" diff --git a/qtox/download/download_qtsvg.sh b/qtox/download/download_qtsvg.sh index 64ae206..13410dd 100755 --- a/qtox/download/download_qtsvg.sh +++ b/qtox/download/download_qtsvg.sh @@ -13,9 +13,6 @@ source "$(dirname "$(realpath "$0")")/version_qt.sh" MIRROR=http://master.qt-project.org -( - mkdir qtsvg && cd qtsvg - download_verify_extract_tarball \ - "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtsvg-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ - "$QTSVG_HASH" -) +download_verify_extract_tarball \ + "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtsvg-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ + "$QTSVG_HASH" diff --git a/qtox/download/download_qttools.sh b/qtox/download/download_qttools.sh index 7f7117c..709bc80 100755 --- a/qtox/download/download_qttools.sh +++ b/qtox/download/download_qttools.sh @@ -13,9 +13,6 @@ source "$(dirname "$(realpath "$0")")/version_qt.sh" MIRROR=http://master.qt-project.org -( - mkdir qttools && cd qttools - download_verify_extract_tarball \ - "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qttools-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ - "$QTTOOLS_HASH" -) +download_verify_extract_tarball \ + "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qttools-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ + "$QTTOOLS_HASH" diff --git a/qtox/download/download_qtwayland.sh b/qtox/download/download_qtwayland.sh index e09afc6..7c15529 100755 --- a/qtox/download/download_qtwayland.sh +++ b/qtox/download/download_qtwayland.sh @@ -13,9 +13,6 @@ source "$(dirname "$(realpath "$0")")/version_qt.sh" MIRROR=http://master.qt-project.org -( - mkdir qtwayland && cd qtwayland - download_verify_extract_tarball \ - "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtwayland-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ - "$QTWAYLAND_HASH" -) +download_verify_extract_tarball \ + "$MIRROR/archive/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_PATCH/submodules/qtwayland-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_PATCH.tar.xz" \ + "$QTWAYLAND_HASH"