mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
chore(deps): Add support for msgpack dependency
This commit is contained in:
parent
56eed63fde
commit
e076d4b7a7
18
buildscripts/build_msgpack_c_windows.sh
Executable file
18
buildscripts/build_msgpack_c_windows.sh
Executable file
|
@ -0,0 +1,18 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later AND MIT
|
||||||
|
# Copyright (c) 2022 by The qTox Project Contributors
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
"$(dirname "$0")"/download/download_msgpack_c.sh
|
||||||
|
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX=/windows/ \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_TOOLCHAIN_FILE=/build/windows-toolchain.cmake \
|
||||||
|
-DMSGPACK_BUILD_EXAMPLES=OFF \
|
||||||
|
-DMSGPACK_BUILD_TESTS=OFF \
|
||||||
|
.
|
||||||
|
|
||||||
|
make -j $(nproc)
|
||||||
|
make install
|
|
@ -36,6 +36,7 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
|
||||||
ffmpeg-devel \
|
ffmpeg-devel \
|
||||||
libexif-devel \
|
libexif-devel \
|
||||||
qrencode-devel \
|
qrencode-devel \
|
||||||
|
msgpack-devel \
|
||||||
openal-soft-devel \
|
openal-soft-devel \
|
||||||
kf5-sonnet-devel \
|
kf5-sonnet-devel \
|
||||||
libXScrnSaver-devel \
|
libXScrnSaver-devel \
|
||||||
|
|
|
@ -40,6 +40,7 @@ RUN apt-get update && \
|
||||||
libkf5sonnet-dev \
|
libkf5sonnet-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libqrencode-dev \
|
libqrencode-dev \
|
||||||
|
libmsgpack-dev \
|
||||||
qttools5-dev && \
|
qttools5-dev && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -63,4 +64,3 @@ RUN mkdir -p /src/tox && \
|
||||||
rm -fr /src/tox
|
rm -fr /src/tox
|
||||||
|
|
||||||
WORKDIR /qtox
|
WORKDIR /qtox
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@ RUN apt-get update && \
|
||||||
libkf5sonnet-dev \
|
libkf5sonnet-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libqrencode-dev \
|
libqrencode-dev \
|
||||||
|
libmsgpack-dev \
|
||||||
qt5-default \
|
qt5-default \
|
||||||
qttools5-dev && \
|
qttools5-dev && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
|
|
|
@ -37,6 +37,7 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
|
||||||
openal-soft-devel \
|
openal-soft-devel \
|
||||||
kf5-sonnet-devel \
|
kf5-sonnet-devel \
|
||||||
libXScrnSaver-devel \
|
libXScrnSaver-devel \
|
||||||
|
msgpack-devel \
|
||||||
sqlite-devel \
|
sqlite-devel \
|
||||||
sqlcipher-devel && \
|
sqlcipher-devel && \
|
||||||
dnf clean all
|
dnf clean all
|
||||||
|
|
|
@ -39,6 +39,11 @@ RUN mkdir -p /src/libsodium && \
|
||||||
cd /src/libsodium && \
|
cd /src/libsodium && \
|
||||||
/build/download/download_sodium.sh
|
/build/download/download_sodium.sh
|
||||||
|
|
||||||
|
COPY download/download_msgpack_c.sh /build/download/download_msgpack_c.sh
|
||||||
|
RUN mkdir -p /src/msgpack && \
|
||||||
|
cd /src/msgpack && \
|
||||||
|
/build/download/download_msgpack_c.sh
|
||||||
|
|
||||||
COPY download/download_sqlcipher.sh /build/download/download_sqlcipher.sh
|
COPY download/download_sqlcipher.sh /build/download/download_sqlcipher.sh
|
||||||
RUN mkdir -p /src/sqlcipher && \
|
RUN mkdir -p /src/sqlcipher && \
|
||||||
cd /src/sqlcipher && \
|
cd /src/sqlcipher && \
|
||||||
|
|
|
@ -25,6 +25,7 @@ RUN zypper install --no-recommends -y \
|
||||||
libqt5-qtsvg-devel \
|
libqt5-qtsvg-devel \
|
||||||
libsodium-devel \
|
libsodium-devel \
|
||||||
libvpx-devel \
|
libvpx-devel \
|
||||||
|
msgpack-devel \
|
||||||
openal-soft-devel \
|
openal-soft-devel \
|
||||||
qrencode-devel \
|
qrencode-devel \
|
||||||
sqlcipher-devel \
|
sqlcipher-devel \
|
||||||
|
|
|
@ -58,6 +58,7 @@ RUN apt-get update && \
|
||||||
libinotifytools0-dev \
|
libinotifytools0-dev \
|
||||||
liblz4-dev \
|
liblz4-dev \
|
||||||
libcairo-dev \
|
libcairo-dev \
|
||||||
|
libmsgpack-dev \
|
||||||
desktop-file-utils \
|
desktop-file-utils \
|
||||||
wget \
|
wget \
|
||||||
xxd \
|
xxd \
|
||||||
|
|
|
@ -158,6 +158,13 @@ RUN mkdir -p /src/nsisshellexecasuser && \
|
||||||
/build/build_nsisshellexecasuser_windows.sh && \
|
/build/build_nsisshellexecasuser_windows.sh && \
|
||||||
rm -fr /src/nsisshellexecasuser
|
rm -fr /src/nsisshellexecasuser
|
||||||
|
|
||||||
|
COPY download/download_msgpack_c.sh /build/download/download_msgpack_c.sh
|
||||||
|
COPY build_msgpack_c_windows.sh /build/build_msgpack_c_windows.sh
|
||||||
|
RUN mkdir -p /src/msgpack_c && \
|
||||||
|
cd /src/msgpack_c && \
|
||||||
|
/build/build_msgpack_c_windows.sh && \
|
||||||
|
rm -fr /src/msgpack_c
|
||||||
|
|
||||||
COPY download/download_toxcore.sh /build/download/download_toxcore.sh
|
COPY download/download_toxcore.sh /build/download/download_toxcore.sh
|
||||||
COPY download/download_toxext.sh /build/download/download_toxext.sh
|
COPY download/download_toxext.sh /build/download/download_toxext.sh
|
||||||
COPY download/download_toxext_messages.sh /build/download/download_toxext_messages.sh
|
COPY download/download_toxext_messages.sh /build/download/download_toxext_messages.sh
|
||||||
|
@ -186,6 +193,7 @@ RUN mkdir /export && \
|
||||||
cp /windows/bin/libqrencode.dll /export && \
|
cp /windows/bin/libqrencode.dll /export && \
|
||||||
cp /windows/bin/libsodium-*.dll /export && \
|
cp /windows/bin/libsodium-*.dll /export && \
|
||||||
cp /windows/bin/libsqlcipher-*.dll /export && \
|
cp /windows/bin/libsqlcipher-*.dll /export && \
|
||||||
|
cp /windows/bin/libmsgpackc.dll /export && \
|
||||||
cp /windows/bin/swscale-*.dll /export && \
|
cp /windows/bin/swscale-*.dll /export && \
|
||||||
cp /windows/bin/libcrypto-*.dll /export && \
|
cp /windows/bin/libcrypto-*.dll /export && \
|
||||||
cp /windows/bin/libtoxcore.dll /export && \
|
cp /windows/bin/libtoxcore.dll /export && \
|
||||||
|
|
27
buildscripts/download/download_msgpack_c.sh
Executable file
27
buildscripts/download/download_msgpack_c.sh
Executable file
|
@ -0,0 +1,27 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright © 2022 by The qTox Project Contributors
|
||||||
|
#
|
||||||
|
# This program is libre software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
MSGPACK_VERSION=c-4.0.0
|
||||||
|
MSGPACK_HASH=656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3
|
||||||
|
|
||||||
|
source "$(dirname $0)"/common.sh
|
||||||
|
|
||||||
|
download_verify_extract_tarball \
|
||||||
|
"https://github.com/msgpack/msgpack-c/archive/${MSGPACK_VERSION}.tar.gz" \
|
||||||
|
"${MSGPACK_HASH}"
|
|
@ -83,6 +83,21 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "msgpack",
|
||||||
|
"buildsystem": "cmake-ninja",
|
||||||
|
"config-opts": [
|
||||||
|
"-DCMAKE_BUILD_TYPE=Release",
|
||||||
|
"-DMSGPACK_BUILD_EXAMPLES=OFF",
|
||||||
|
"-DMSGPACK_BUILD_TESTS=OFF"
|
||||||
|
],
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "dir",
|
||||||
|
"path": "/src/msgpack"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "c-toxcore",
|
"name": "c-toxcore",
|
||||||
"buildsystem": "cmake-ninja",
|
"buildsystem": "cmake-ninja",
|
||||||
|
|
|
@ -14,6 +14,7 @@ brew "qrencode"
|
||||||
brew "qt5"
|
brew "qt5"
|
||||||
brew "sqlcipher"
|
brew "sqlcipher"
|
||||||
brew "openal-soft"
|
brew "openal-soft"
|
||||||
|
brew "msgpack"
|
||||||
# accelerate builds with ccache
|
# accelerate builds with ccache
|
||||||
brew "ccache"
|
brew "ccache"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user