Merge branch 'feature/appimage' into develop

.gitignore

 *.pro.user
+build_*/
 lib/qtlib/

.travis.yml

+dist: trusty
+sudo: required
+services:
+  - docker
+
+branches:
+  only:
+    - master
+
+script:
+  - mntdir='/mnt/ocs-manager'
+  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"
+  #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak"
+  - docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
+  - cat transfer.log

ocs-manager.pro

@@ -22,5 +22,6 @@ include($${PWD}/lib/lib.pri)
 include($${PWD}/app/app.pri)
 include($${PWD}/desktop/desktop.pri)
 include($${PWD}/i18n/i18n.pri)
+include($${PWD}/pkg/pkg.pri)
 include($${PWD}/scripts/scripts.pri)
 include($${PWD}/deployment.pri)

pkg/appimage/appimage.sh

+#!/bin/sh
+
+sh scripts/import.sh
+
+qmake PREFIX="/usr"
+make
+make INSTALL_ROOT="ocs-manager.AppDir" install
+
+curl -L -o linuxdeployqt.AppImage "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+chmod 755 linuxdeployqt.AppImage
+
+./linuxdeployqt.AppImage ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -bundle-non-qt-libs -no-translations
+./linuxdeployqt.AppImage ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -appimage

pkg/pkg.pri

+DISTFILES += $${PWD}/appimage/appimage.sh

scripts/build-docker.sh

+#!/bin/bash
+
+################################################################################
+# This is wrapper script for build.sh use from inside docker container
+################################################################################
+
+PKGNAME='ocs-manager'
+
+PKGUSER='pkgbuilder'
+
+BUILDTYPE=''
+if [ "${1}" ]; then
+    BUILDTYPE="${1}"
+fi
+
+PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
+
+BUILDSCRIPT="${PROJDIR}/scripts/build.sh"
+
+TRANSFERLOG="${PROJDIR}/transfer.log"
+
+transfer_file() {
+    filepath="${1}"
+    if [ -f "${filepath}" ]; then
+        filename="$(basename "${filepath}")"
+        echo "Uploading ${filename}" >> "${TRANSFERLOG}"
+        curl -T "${filepath}" "https://transfer.sh/${filename}" >> "${TRANSFERLOG}"
+        echo "" >> "${TRANSFERLOG}"
+    fi
+}
+
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+build_appimage() {
+    # docker-image: ubuntu:16.04
+    apt update -qq
+    apt -y install build-essential qt5-default libqt5websockets5-dev
+    apt -y install git
+    apt -y install curl
+
+    useradd -m ${PKGUSER}
+    export HOME="/home/${PKGUSER}"
+    chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
+
+    su -c "sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
+
+    transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
+}
+
+if [ "${BUILDTYPE}" = 'snap' ]; then
+    build_snap
+elif [ "${BUILDTYPE}" = 'flatpak' ]; then
+    build_flatpak
+elif [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
+else
+    echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+    exit 1
+fi

scripts/build.sh

+#!/bin/bash
+
+################################################################################
+# This is utility script to build distribution packages
+################################################################################
+
+PKGNAME='ocs-manager'
+
+BUILDTYPE=''
+if [ "${1}" ]; then
+    BUILDTYPE="${1}"
+fi
+
+PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
+
+BUILDVER="$(cd "${PROJDIR}" && git describe --always)"
+
+BUILDDIR="${PROJDIR}/build_${PKGNAME}_${BUILDVER}_${BUILDTYPE}"
+
+SRCARCHIVE="${BUILDDIR}/${PKGNAME}.tar.gz"
+
+export_srcarchive() {
+    filepath="${1}"
+    $(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
+}
+
+build_snap() {
+    echo 'Not implemented yet'
+}
+
+build_flatpak() {
+    echo 'Not implemented yet'
+}
+
+build_appimage() {
+    cd "${PROJDIR}"
+    mkdir -p "${BUILDDIR}"
+    export_srcarchive "${SRCARCHIVE}"
+
+    tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
+    cp "${PROJDIR}/pkg/appimage/appimage.sh" "${BUILDDIR}/${PKGNAME}"
+    cd "${BUILDDIR}/${PKGNAME}"
+    sh appimage.sh
+}
+
+if [ "${BUILDTYPE}" = 'snap' ]; then
+    build_snap
+elif [ "${BUILDTYPE}" = 'flatpak' ]; then
+    build_flatpak
+elif [ "${BUILDTYPE}" = 'appimage' ]; then
+    build_appimage
+else
+    echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+    exit 1
+fi

scripts/scripts.pri

-DISTFILES += $${PWD}/import.sh
+DISTFILES += \
+    $${PWD}/build-docker.sh \
+    $${PWD}/build.sh \
+    $${PWD}/import.sh