Page MenuHomePhorge
Files F140034

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/Dockerfile.deps b/Dockerfile.deps
index 4613a95..9b50754 100644
--- a/Dockerfile.deps
+++ b/Dockerfile.deps
@@ -1,24 +1,24 @@
ARG LIBKAZV_TAG
FROM reg.lily.kazv.moe/kazv/libkazv/libkazv:$LIBKAZV_TAG
ARG BUILD_TYPE=Debug
ARG JOBS=3
ARG DEPS_INSTALL_DIR=/opt/libkazv-deps
ARG LIBKAZV_INSTALL_DIR=/opt/libkazv
RUN wget https://raw.githubusercontent.com/KDE/docker-neon/Neon/stable/public.key && \
apt-key add public.key && \
rm public.key
ADD packaging/GNU-Linux/appimage/kde-neon.list /etc/apt/sources.list.d/
RUN apt-get update && \
apt-get -y upgrade && \
DEBIAN_FRONTEND="noninteractive" \
apt-get -y install aptitude && \
aptitude -y install extra-cmake-modules \
qtbase5-dev qtdeclarative5-dev qtmultimedia5-dev qml-module-qtmultimedia libqt5concurrent5 libqt5gui5 \
libqt5svg5-dev qtquickcontrols2-5-dev qml-module-qtquick-layouts qml-module-qtquick-controls2 \
qml-module-qtquick-controls qml-module-qt-labs-qmlmodels kirigami2-dev libkf5config-dev wget libqt5multimedia5-plugins \
- qt5-gtk-platformtheme plasma-integration libkf5kio-dev g++-10
+ qt5-gtk-platformtheme plasma-integration libkf5kio-dev g++-10 weston dbus-x11
diff --git a/packaging/GNU-Linux/appimage/build.sh b/packaging/GNU-Linux/appimage/build.sh
index ea4e22c..21ed3b1 100755
--- a/packaging/GNU-Linux/appimage/build.sh
+++ b/packaging/GNU-Linux/appimage/build.sh
@@ -1,47 +1,47 @@
#!/bin/bash
set -x
set -e
thisDir="$(readlink -f "$(dirname "$(realpath "$0")")")"
BUILD_TYPE="$1"
if [[ ! "$BUILD_TYPE" ]]; then
export BUILD_TYPE=Debug
fi
export JOBS=$(( $(nproc) / 2)) DEPS_INSTALL_DIR=/opt/libkazv-deps LIBKAZV_INSTALL_DIR=/opt/libkazv KAZV_INSTALL_DIR=/usr
mkdir build && cd build && \
export CC=gcc-10 CXX=g++-10 && \
cmake .. -DCMAKE_INSTALL_PREFIX="$KAZV_INSTALL_DIR" \
-DCMAKE_PREFIX_PATH="$LIBKAZV_INSTALL_DIR;$DEPS_INSTALL_DIR" -DCMAKE_BUILD_TYPE=$BUILD_TYPE && \
make -j$JOBS && \
make -j$JOBS DESTDIR=AppDir install && \
- make test
+ dbus-launch --exit-with-session -- bash "$thisDir"/test.sh
export LD_LIBRARY_PATH="$LIBKAZV_INSTALL_DIR/lib:$DEPS_INSTALL_DIR/lib"
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
chmod +x linuxdeploy*.AppImage
export QML_SOURCES_PATHS=../src
./linuxdeploy-plugin-qt-x86_64.AppImage --appimage-extract
./linuxdeploy-x86_64.AppImage --appimage-extract
# https://github.com/linuxdeploy/linuxdeploy/issues/154
mv -v ./linuxdeploy-plugin-qt-x86_64.AppImage ./linuxdeploy-notplugin-qt-x86_64.AppImage
# Enable the appimage to use Plasma themes, linuxdeploy-plugin-qt will only copy the gtk3 plugin -((
mkdir -pv AppDir/usr/plugins/platformthemes/
cp /usr/lib/x86_64-linux-gnu/qt5/plugins/platformthemes/KDEPlasmaPlatformTheme.so AppDir/usr/plugins/platformthemes/
# Workaround "cannot mix incompatible qt versions" problem
mkdir -pv AppDir/apprun-hooks/
cp -v "$thisDir"/hooks/patch-ld-library-path.sh AppDir/apprun-hooks/
./squashfs-root/AppRun --appdir AppDir -i ../icons/kazvlogo-256.png --plugin qt --output appimage # -l /lib/x86_64-linux-gnu/libstdc++.so.6
cp kazv*.AppImage ../kazv-"$BUILD_TYPE".AppImage
diff --git a/packaging/GNU-Linux/appimage/test.sh b/packaging/GNU-Linux/appimage/test.sh
new file mode 100644
index 0000000..e174e67
--- /dev/null
+++ b/packaging/GNU-Linux/appimage/test.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# inspired by https://github.com/johanhelsing/docker-qt-tests/blob/master/scripts/test-qt.sh
+
+set -x
+
+weston --backend=headless-backend.so --idle-time=0 &
+
+sleep 5
+QT_QPA_PLATFORM=wayland make test
+
+ret=$?
+
+echo "Tests returned $ret"
+echo
+
+cat Testing/Temporary/LastTest.log
+
+kill %1
+
+exit $ret

File Metadata

Mime Type
text/x-diff
Expires
Sun, Jan 19, 10:50 AM (3 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
55110
Default Alt Text
(3 KB)

Event Timeline