From f81123250d6b6e8030a39c6145ed9c2ac5025d2d Mon Sep 17 00:00:00 2001 From: JBBgameich Date: Mon, 20 Nov 2017 17:44:25 +0100 Subject: [PATCH 1/4] Prepare for building AppImages on travis --- .travis.yml | 2 +- utils/AppImage.sh | 28 ++++++++++++++++++++++++++++ utils/build.sh | 8 ++++++++ utils/dependencies.sh | 27 +++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100755 utils/AppImage.sh create mode 100755 utils/build.sh create mode 100755 utils/dependencies.sh diff --git a/.travis.yml b/.travis.yml index bf463b21..1386a2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ before_install: - docker pull debian:sid-slim script: - - docker run -v $PWD:/mnt/kaidan debian:sid-slim /bin/bash -c "apt update; apt install software-properties-common dirmngr gnupg ca-certificates git -y; apt-key adv --keyserver hkp://pgp.mit.edu --recv-key "210EB0BCA70439F0"; echo deb https://raw.githubusercontent.com/kaidanim/packages/master sid main >> /etc/apt/sources.list; apt-get update; apt-get install cmake build-essential zlib1g-dev libgloox-dev libqt5quick5 libqt5quickcontrols2-5 libqt5quickwidgets5 libqt5qml5 libqt5gui5 libqt5core5a qtdeclarative5-dev qttools5-dev qt5-default qtquickcontrols2-5-dev kirigami2-dev -y; cd /mnt/kaidan; mkdir build; cd build; cmake .. -DI18N=1; make -j$(nproc)" + - docker run -v $PWD:/mnt/kaidan debian:sid-slim /bin/bash -c "cd /mnt/kaidan/utils; ./dependencies.sh; build.sh" diff --git a/utils/AppImage.sh b/utils/AppImage.sh new file mode 100755 index 00000000..7a9b12c9 --- /dev/null +++ b/utils/AppImage.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +echo "*****************************************" +echo "Building Kaidan AppImage. This may take a long time" +echo "*****************************************" + +# Download linuxdeployqt +if ! [ -f linuxdeployqt-continuous-x86_64.AppImage ]; then + wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage + chmod +x linuxdeployqt-continuous-x86_64.AppImage +fi + +# configure buildsystem and environment for AppDir installation +mkdir ../build +cd ../build +export QT_SELECT=qt5 +cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../AppDir/usr/ + +# Build kaidan +make -j$(nproc) +make install +cd .. + +# Copy dependencies into AppDir +./utils/linuxdeployqt-continuous-x86_64.AppImage $PWD/AppDir/usr/share/applications/kaidan.desktop -qmldir=/usr/lib/x86_64-linux-gnu/qt5/qml/ -bundle-non-qt-libs + +# Create AppImage +./utils/linuxdeployqt-continuous-x86_64.AppImage $PWD/AppDir/usr/share/applications/kaidan.desktop -appimage diff --git a/utils/build.sh b/utils/build.sh new file mode 100755 index 00000000..7ff5074e --- /dev/null +++ b/utils/build.sh @@ -0,0 +1,8 @@ +echo "*****************************************" +echo "Building Kaidan binary" +echo "*****************************************" + +mkdir ../build; cd ../build/ + +cmake .. -DI18N=1 +make -j$(nproc) diff --git a/utils/dependencies.sh b/utils/dependencies.sh new file mode 100755 index 00000000..a2b05396 --- /dev/null +++ b/utils/dependencies.sh @@ -0,0 +1,27 @@ +echo "*****************************************" +echo "Fetching dependencies" +echo "*****************************************" + +apt update + +apt install software-properties-common dirmngr gnupg ca-certificates -y + +apt-key adv --recv-key "210EB0BCA70439F0" +echo deb https://raw.githubusercontent.com/kaidanim/packages/master sid main >> /etc/apt/sources.list + +apt update +apt install cmake \ + build-essential \ + zlib1g-dev \ + libgloox-dev \ + libqt5quick5 \ + libqt5quickcontrols2-5 \ + libqt5quickwidgets5 \ + libqt5qml5 \ + libqt5gui5 \ + libqt5core5a \ + qtdeclarative5-dev \ + qttools5-dev \ + qt5-default \ + qtquickcontrols2-5-dev \ + kirigami2-dev -y From cbabe870c730d8b46d2e76a922fa329723528fab Mon Sep 17 00:00:00 2001 From: JBBgameich Date: Mon, 20 Nov 2017 17:53:10 +0100 Subject: [PATCH 2/4] correct build.sh path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1386a2d8..41e9033b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ before_install: - docker pull debian:sid-slim script: - - docker run -v $PWD:/mnt/kaidan debian:sid-slim /bin/bash -c "cd /mnt/kaidan/utils; ./dependencies.sh; build.sh" + - docker run -v $PWD:/mnt/kaidan debian:sid-slim /bin/bash -c "cd /mnt/kaidan/utils; ./dependencies.sh; ./build.sh" From afc106f0f9e09405599ac479d7077038d1f6c58d Mon Sep 17 00:00:00 2001 From: JBBgameich Date: Mon, 20 Nov 2017 17:59:41 +0100 Subject: [PATCH 3/4] rename files only useful for travis to travis-* --- .travis.yml | 2 +- utils/{build.sh => travis-build.sh} | 0 utils/{dependencies.sh => travis-dependencies.sh} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename utils/{build.sh => travis-build.sh} (100%) rename utils/{dependencies.sh => travis-dependencies.sh} (100%) diff --git a/.travis.yml b/.travis.yml index 41e9033b..f836676b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ before_install: - docker pull debian:sid-slim script: - - docker run -v $PWD:/mnt/kaidan debian:sid-slim /bin/bash -c "cd /mnt/kaidan/utils; ./dependencies.sh; ./build.sh" + - docker run -v $PWD:/mnt/kaidan debian:sid-slim /bin/bash -c "cd /mnt/kaidan/utils; ./travis-dependencies.sh; ./travis-build.sh" diff --git a/utils/build.sh b/utils/travis-build.sh similarity index 100% rename from utils/build.sh rename to utils/travis-build.sh diff --git a/utils/dependencies.sh b/utils/travis-dependencies.sh similarity index 100% rename from utils/dependencies.sh rename to utils/travis-dependencies.sh From da62685c37ec58f5677a77c2941011f83b2eb741 Mon Sep 17 00:00:00 2001 From: JBBgameich Date: Mon, 20 Nov 2017 18:10:18 +0100 Subject: [PATCH 4/4] AppImage will follow in an other PR --- utils/AppImage.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100755 utils/AppImage.sh diff --git a/utils/AppImage.sh b/utils/AppImage.sh deleted file mode 100755 index 7a9b12c9..00000000 --- a/utils/AppImage.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -echo "*****************************************" -echo "Building Kaidan AppImage. This may take a long time" -echo "*****************************************" - -# Download linuxdeployqt -if ! [ -f linuxdeployqt-continuous-x86_64.AppImage ]; then - wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage - chmod +x linuxdeployqt-continuous-x86_64.AppImage -fi - -# configure buildsystem and environment for AppDir installation -mkdir ../build -cd ../build -export QT_SELECT=qt5 -cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../AppDir/usr/ - -# Build kaidan -make -j$(nproc) -make install -cd .. - -# Copy dependencies into AppDir -./utils/linuxdeployqt-continuous-x86_64.AppImage $PWD/AppDir/usr/share/applications/kaidan.desktop -qmldir=/usr/lib/x86_64-linux-gnu/qt5/qml/ -bundle-non-qt-libs - -# Create AppImage -./utils/linuxdeployqt-continuous-x86_64.AppImage $PWD/AppDir/usr/share/applications/kaidan.desktop -appimage