From cd184d8284ac685a25a5a797e480567f38f46395 Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 1 May 2019 06:57:46 +0000 Subject: [PATCH 1/7] Generate and upload AppImage --- share/ci.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/share/ci.sh b/share/ci.sh index ae72eb9..c26e482 100755 --- a/share/ci.sh +++ b/share/ci.sh @@ -79,6 +79,18 @@ if [ "${OS}" = "Linux" ]; then make INSTALL_ROOT=`pwd`/pkg install tree pkg + mkdir $CWD/build8 + cd $CWD/build8 + qmake -qt=qt5 CONFIG+=release PREFIX=/usr CONFIG+=no_dbus .. + make -j$(nproc) + make INSTALL_ROOT=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 + ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage + wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # TODO: Move to .travis.yml + bash upload.sh APPNAME*.AppImage* # TODO: Move to .travis.yml + #echo "===> Building linux64 ..." #PKG_CONFIG_PATH="${SDK}/lib/pkgconfig:${PKG_CONFIG_PATH}" #PATH=${SDK}/bin:/usr/bin:/bin From 6e06d1ec009bcc4435f43bdf238bcaab955c37ae Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 8 May 2019 18:47:46 +0000 Subject: [PATCH 2/7] Update ci.sh --- share/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/ci.sh b/share/ci.sh index c26e482..e3ea7d3 100755 --- a/share/ci.sh +++ b/share/ci.sh @@ -83,11 +83,11 @@ if [ "${OS}" = "Linux" ]; then cd $CWD/build8 qmake -qt=qt5 CONFIG+=release PREFIX=/usr CONFIG+=no_dbus .. make -j$(nproc) - make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ + make INSTALL_ROOT=appdir -j$(nproc) install ; find build8/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 - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage + ./linuxdeployqt-continuous-x86_64.AppImage build8/appdir/usr/share/applications/*.desktop -appimage wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # TODO: Move to .travis.yml bash upload.sh APPNAME*.AppImage* # TODO: Move to .travis.yml From 4c1bdc0683eecec96c0999cff29fc8396fde7cae Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 8 May 2019 19:01:46 +0000 Subject: [PATCH 3/7] Update ci.sh --- share/ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/ci.sh b/share/ci.sh index e3ea7d3..8cd342f 100755 --- a/share/ci.sh +++ b/share/ci.sh @@ -83,11 +83,11 @@ if [ "${OS}" = "Linux" ]; then cd $CWD/build8 qmake -qt=qt5 CONFIG+=release PREFIX=/usr CONFIG+=no_dbus .. make -j$(nproc) - make INSTALL_ROOT=appdir -j$(nproc) install ; find build8/appdir/ + make INSTALL_ROOT=appdir -j$(nproc) install ; find fm/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 - ./linuxdeployqt-continuous-x86_64.AppImage build8/appdir/usr/share/applications/*.desktop -appimage + ./linuxdeployqt-continuous-x86_64.AppImage fm/appdir/usr/share/applications/*.desktop -appimage wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # TODO: Move to .travis.yml bash upload.sh APPNAME*.AppImage* # TODO: Move to .travis.yml From 4d563d657f796107ff21bfc000a6b6fac0b3a475 Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 8 May 2019 19:15:33 +0000 Subject: [PATCH 4/7] Update qtfm.desktop --- fm/qtfm.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fm/qtfm.desktop b/fm/qtfm.desktop index 5a9c93c..b22f65e 100644 --- a/fm/qtfm.desktop +++ b/fm/qtfm.desktop @@ -6,6 +6,6 @@ Type=Application Icon=qtfm Exec=qtfm Terminal=false -MimeType=application/x-directory;inode/directory -Categories=Utility;FileManager +MimeType=application/x-directory;inode/directory; +Categories=Utility;FileManager; StartupNotify=false From c3f63bd61444ec07ff36c19f5acafc8ba827e51b Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 8 May 2019 19:18:07 +0000 Subject: [PATCH 5/7] -qmake --- share/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/ci.sh b/share/ci.sh index 8cd342f..73ae5fb 100755 --- a/share/ci.sh +++ b/share/ci.sh @@ -87,7 +87,7 @@ if [ "${OS}" = "Linux" ]; then 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 - ./linuxdeployqt-continuous-x86_64.AppImage fm/appdir/usr/share/applications/*.desktop -appimage + ./linuxdeployqt-continuous-x86_64.AppImage fm/appdir/usr/share/applications/*.desktop -appimage -qmake=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # TODO: Move to .travis.yml bash upload.sh APPNAME*.AppImage* # TODO: Move to .travis.yml From 2fdcd1b17dd63ff01f54b6af9584da64a56c2591 Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 8 May 2019 19:26:29 +0000 Subject: [PATCH 6/7] QtFM --- share/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/ci.sh b/share/ci.sh index 73ae5fb..66817c2 100755 --- a/share/ci.sh +++ b/share/ci.sh @@ -89,7 +89,7 @@ if [ "${OS}" = "Linux" ]; then unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH ./linuxdeployqt-continuous-x86_64.AppImage fm/appdir/usr/share/applications/*.desktop -appimage -qmake=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # TODO: Move to .travis.yml - bash upload.sh APPNAME*.AppImage* # TODO: Move to .travis.yml + bash upload.sh QtFM*.AppImage* # TODO: Move to .travis.yml #echo "===> Building linux64 ..." #PKG_CONFIG_PATH="${SDK}/lib/pkgconfig:${PKG_CONFIG_PATH}" From 2e88df786aa06db9a32b5c0027403bbb0d5d106e Mon Sep 17 00:00:00 2001 From: probonopd Date: Thu, 9 May 2019 05:30:34 +0000 Subject: [PATCH 7/7] -extra-plugins=iconengines,imageformats --- share/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/ci.sh b/share/ci.sh index 66817c2..df0bd12 100755 --- a/share/ci.sh +++ b/share/ci.sh @@ -87,7 +87,7 @@ if [ "${OS}" = "Linux" ]; then 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 - ./linuxdeployqt-continuous-x86_64.AppImage fm/appdir/usr/share/applications/*.desktop -appimage -qmake=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake + ./linuxdeployqt-continuous-x86_64.AppImage fm/appdir/usr/share/applications/*.desktop -extra-plugins=iconengines,imageformats -appimage -qmake=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh # TODO: Move to .travis.yml bash upload.sh QtFM*.AppImage* # TODO: Move to .travis.yml