Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Add qoi and sonnet to appimage and windows builders. #228

Merged
merged 1 commit into from
Jan 7, 2025
Merged

chore: Add qoi and sonnet to appimage and windows builders. #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qtox/build_hunspell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "hunspell" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64" "$@"
parse_arch --dep "hunspell" --supported "linux-x86_64 win32 win64 macos-x86_64 macos-arm64 win32 win64" "$@"

if [ "$LIB_TYPE" = "shared" ]; then
ENABLE_STATIC=--disable-static
Expand Down
2 changes: 1 addition & 1 deletion qtox/build_kimageformats.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "kimageformats" --supported "linux-x86_64 macos-x86_64 macos-arm64" "$@"
parse_arch --dep "kimageformats" --supported "linux-x86_64 macos-x86_64 macos-arm64 win32 win64" "$@"

"$SCRIPT_DIR/download/download_kimageformats.sh"

Expand Down
8 changes: 4 additions & 4 deletions qtox/build_sonnet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"

source "$SCRIPT_DIR/build_utils.sh"

parse_arch --dep "sonnet" --supported "linux-x86_64 macos-x86_64 macos-arm64" "$@"
parse_arch --dep "sonnet" --supported "linux-x86_64 macos-x86_64 macos-arm64 win32 win64" "$@"

"$SCRIPT_DIR/download/download_sonnet.sh"

if [ "$LIB_TYPE" = "shared" ]; then
CMAKE_CXX_FLAGS=
ENABLE_SHARED=ON
HUNSPELL_LIBRARIES="$(echo /usr/lib/libhunspell*.so)"
HUNSPELL_LIBRARIES=()
else
CMAKE_CXX_FLAGS="-DSONNET_STATIC"
ENABLE_SHARED=OFF
HUNSPELL_LIBRARIES="$(echo "$DEP_PREFIX"/lib/libhunspell*.a)"
HUNSPELL_LIBRARIES=("$(echo "$DEP_PREFIX"/lib/libhunspell*.a)")
find . -name CMakeLists.txt -exec sed -i '' -e 's/ MODULE$/ STATIC/g' '{}' ';'
find . -name CMakeLists.txt -exec sed -i '' -e 's/install(TARGETS sonnet_\([^ ]*\) /&EXPORT KF6SonnetTargets/g' '{}' ';'
if [ "$SCRIPT_ARCH" = "macos-x86_64" ] || [ "$SCRIPT_ARCH" = "macos-arm64" ]; then
Expand All @@ -38,7 +38,7 @@ fi
-DBUILD_SHARED_LIBS="$ENABLE_SHARED" \
-DBUILD_DESIGNERPLUGIN=OFF \
-DSONNET_USE_QML=OFF \
-DHUNSPELL_LIBRARIES="$HUNSPELL_LIBRARIES" \
"${HUNSPELL_LIBRARIES[@]}" \
-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -DQT_MESSAGELOGCONTEXT" \
-B_build \
-GNinja \
Expand Down
4 changes: 3 additions & 1 deletion qtox/build_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ parse_arch() {
CLANG_SANITIZER=""
fi

if [ -n "$SANITIZE" ]; then
if [ "$SCRIPT_ARCH" == "win32" ] || [ "$SCRIPT_ARCH" == "win64" ]; then
QT_PREFIX=$DEP_PREFIX
elif [ -n "$SANITIZE" ]; then
QT_PREFIX="$DEP_PREFIX/qt-$SANITIZE"
else
QT_PREFIX="$DEP_PREFIX/qt"
Expand Down
73 changes: 40 additions & 33 deletions qtox/docker/Dockerfile.alpine-appimage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,63 +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 && \
/build/build_qtbase_linux.sh --arch ${SCRIPT_ARCH} --libtype shared && \
rm -fr /src/qt
RUN mkdir -p /src/qt \
&& cd /src/qt \
&& /build/build_qtbase_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/qt

COPY download/download_qttools.sh /build/download/
COPY build_qttools_linux.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/qt \
&& cd /src/qt \
&& /build/build_qttools_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/qt

COPY download/download_qtsvg.sh /build/download/
COPY build_qtsvg_linux.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/qt \
&& cd /src/qt \
&& /build/build_qtsvg_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/qt

COPY download/download_qtimageformats.sh /build/download/
COPY build_qtimageformats_linux.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/qt \
&& cd /src/qt \
&& /build/build_qtimageformats_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/qt

COPY download/download_qtwayland.sh /build/download/
COPY build_qtwayland_linux.sh /build/

RUN mkdir -p /src/qt && \
cd /src/qt && \
/build/build_qtwayland_linux.sh --arch ${SCRIPT_ARCH} --libtype shared && \
rm -fr /src/qt
RUN mkdir -p /src/qt \
&& cd /src/qt \
&& /build/build_qtwayland_linux.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/qt

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
RUN mkdir -p /src/tox \
&& cd /src/tox \
&& /build/build_extra_cmake_modules.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/tox

COPY download/download_sonnet.sh /build/download/
COPY build_sonnet.sh /build/
RUN mkdir -p /src/tox && \
cd /src/tox && \
/build/build_sonnet.sh && \
rm -fr /src/tox
RUN mkdir -p /src/tox \
&& cd /src/tox \
&& /build/build_sonnet.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/tox

COPY download/download_kimageformats.sh /build/download/
COPY build_kimageformats.sh /build/
RUN mkdir -p /src/tox \
&& cd /src/tox \
&& /build/build_kimageformats.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/tox

COPY download/download_toxcore.sh /build/download/
COPY build_toxcore_system.sh /build/
RUN mkdir -p /src/tox && \
cd /src/tox && \
/build/build_toxcore_system.sh && \
rm -fr /src/tox
COPY build_toxcore.sh /build/
RUN mkdir -p /src/tox \
&& cd /src/tox \
&& /build/build_toxcore.sh --arch "$SCRIPT_ARCH" --libtype shared \
&& rm -fr /src/tox

WORKDIR /qtox
ENV HOME=/qtox
Loading
Loading