From e283868ae3a7d9570d0b5f07f93833a5fb662766 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 6 Jan 2019 22:30:34 +0000 Subject: [PATCH 1/3] AppImage --- .travis.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 04145950c..d43fedab3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,21 @@ before_install: script: - mkdir build && cd build -- cmake .. -DUSE_INTREE_LIBQMC=1 # TODO: add building with an external lib +- if [ "$TRAVIS_OS_NAME" != "linux" ]; then cmake .. -DUSE_INTREE_LIBQMC=1; fi # TODO: add building with an external lib +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake .. -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; fi - cmake --build . --target all #- appstream-util validate linux/*.appdata.xml +- | + if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]; then + make DESTDIR=appdir -j$(nproc) install ; find appdir/ + wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" + chmod a+x linuxdeployqt-continuous-x86_64.AppImage + unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH + export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file + ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage + wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh + bash upload.sh Quaternion*.AppImage* + fi notifications: webhooks: From 70c2ecf831bfe90220b8e7eef0b2d662938d0bca Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 17 Jan 2019 16:40:57 +0900 Subject: [PATCH 2/3] Build RelWithDebInfo everywhere; preset INSTALL_PREFIX --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d43fedab3..4fd9aec8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: env: [ 'ENV_EVAL="CC=gcc-5 && CXX=g++-5"' ] - os: linux compiler: clang + env: [ 'ENV_EVAL="INSTALL_PREFIX=/usr"' ] - os: osx env: [ 'PATH=/usr/local/opt/qt/bin:$PATH"' ] @@ -30,8 +31,7 @@ before_install: script: - mkdir build && cd build -- if [ "$TRAVIS_OS_NAME" != "linux" ]; then cmake .. -DUSE_INTREE_LIBQMC=1; fi # TODO: add building with an external lib -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake .. -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr; fi +- cmake .. -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX # TODO: add building with an external lib - cmake --build . --target all #- appstream-util validate linux/*.appdata.xml - | From e3f1ec61d86264353a9f84c6f6bdf11f2014c65e Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 17 Jan 2019 17:22:49 +0900 Subject: [PATCH 3/3] Test installation on all platforms --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fd9aec8b..0295ccdb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,16 +32,16 @@ before_install: script: - mkdir build && cd build - cmake .. -DUSE_INTREE_LIBQMC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX # TODO: add building with an external lib -- cmake --build . --target all #- appstream-util validate linux/*.appdata.xml +- cmake --build . --target all +- DESTDIR=install cmake --build . --target install && find install/ - | if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]; then - make DESTDIR=appdir -j$(nproc) install ; find appdir/ wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" chmod a+x linuxdeployqt-continuous-x86_64.AppImage - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH + unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage + ./linuxdeployqt-continuous-x86_64.AppImage install/usr/share/applications/*.desktop -appimage wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh bash upload.sh Quaternion*.AppImage* fi