Verified Commit 123bd613 authored by Linus Jahn's avatar Linus Jahn 🍙

appimage: Fix build; Use QXmpp from system

It also adds the zsync file to automatically update the AppImage.
parent 11c1c986
Pipeline #225 passed with stage
in 4 minutes and 51 seconds
linux-appimage:
image: kaidan/ubuntu-trusty
script:
- utils/build-linux-appimage.sh
image: kaidan/ubuntu-xenial
script: utils/build-linux-appimage.sh
variables:
QT_LINUX: /opt/qt510
QXMPP_BUILD: /usr
artifacts:
paths:
- "*.AppImage"
- "*.AppImage.zsync"
expire_in: 1 week
click-xenial:
image: kaidan/ubuntu-touch-xenial
script:
- utils/travis/build.sh
script: utils/travis/build.sh
variables:
PLATFORM: ubuntu-touch
artifacts:
......@@ -22,24 +21,21 @@ click-xenial:
ubuntu-trusty:
image: kaidan/ubuntu-trusty
script:
- utils/travis/build.sh
script: utils/travis/build.sh
neon-bionic:
image: kaidan/neon-bionic
script:
- utils/travis/build.sh
script: utils/travis/build.sh
debian-sid:
image: kaidan/debian-unstable
script:
- utils/travis/build.sh
script: utils/travis/build.sh
archlinux:
image: kaidan/archlinux
script:
- utils/travis/build.sh
script: utils/travis/build.sh
variables:
GIT_SUBMODULE_STRATEGY: recursive
BUILD_SYSTEM: cmake
BUILD_TYPE: Release
......@@ -12,7 +12,7 @@ BUILD_TYPE="${BUILD_TYPE:-Debug}"
KAIDAN_SOURCES=$(dirname "$(readlink -f "${0}")")/..
KIRIGAMI_BUILD=/tmp/kirigami-linux-build
QXMPP_BUILD=/tmp/qxmpp-linux-build
QXMPP_BUILD=${QXMPP_BUILD:-/tmp/qxmpp-linux-build}
echo "-- Starting $BUILD_TYPE build of Kaidan --"
......@@ -51,7 +51,7 @@ fi
export QT_SELECT=qt5
if [ ! -f "$QXMPP_BUILD/lib/pkgconfig/qxmpp.pc" ]; then
if ! $(find $QXMPP_BUILD -name libqxmpp.so >/dev/null); then
echo "*****************************************"
echo "Building QXmpp"
echo "*****************************************"
......@@ -123,21 +123,16 @@ echo "*****************************************"
cd $KAIDAN_SOURCES
export LD_LIBRARY_PATH=$QT_LINUX/lib/:$KIRIGAMI_BUILD/lib:$LD_LIBRARY_PATH
export PATH=$QT_LINUX/bin/:$PATH
# set qmake binary when using portable Qt; linuxdeployqt will find it on its
# own on global installs
if [ -f $QT_LINUX/bin/qmake ]; then
$KAIDAN_SOURCES/3rdparty/linuxdeployqt/squashfs-root/AppRun \
$KAIDAN_SOURCES/AppDir/usr/share/applications/kaidan.desktop \
-qmake=$QMAKE_BINARY \
-qmldir=$KAIDAN_SOURCES/src/qml/ \
-qmlimport=$KIRIGAMI_BUILD/lib/qml/ \
-appimage -no-copy-copyright-files
else
$KAIDAN_SOURCES/3rdparty/linuxdeployqt/squashfs-root/AppRun \
$KAIDAN_SOURCES/AppDir/usr/share/applications/kaidan.desktop \
-qmldir=$KAIDAN_SOURCES/src/qml/ \
-qmlimport=$KIRIGAMI_BUILD/lib/qml/ \
-appimage -no-copy-copyright-files
QMAKE_BINARY="-qmake=$QT_LINUX/bin/qmake"
fi
$KAIDAN_SOURCES/3rdparty/linuxdeployqt/squashfs-root/AppRun \
$KAIDAN_SOURCES/AppDir/usr/share/applications/kaidan.desktop \
-qmldir=$KAIDAN_SOURCES/src/qml/ \
-qmlimport=$KIRIGAMI_BUILD/lib/qml/ \
-appimage -no-copy-copyright-files \
$QMAKE_BINARY
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment