From ed5d7eaef41cc15a0ef3fec7889238a5821db4b7 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 15 Oct 2017 20:36:32 +0200
Subject: [PATCH] Remove useless targets, test AppImage generation for Linux.

---
 resources/binaries                         |  2 +-
 resources/scripts/.travis-install-linux.sh | 29 ++++++++++++++++++---
 rssguard.pro                               | 30 +++++-----------------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/resources/binaries b/resources/binaries
index 4a01edaec..ae7084718 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8
+Subproject commit ae7084718c41afc01919779e58cd449e0eebd401
diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh
index 1c7457620..51da73cd0 100755
--- a/resources/scripts/.travis-install-linux.sh
+++ b/resources/scripts/.travis-install-linux.sh
@@ -1,16 +1,39 @@
 #!/bin/bash
 
+# Setup Qt build environment.
 source /opt/qt59/bin/qt59-env.sh
 mkdir rssguard-build && cd rssguard-build
+
+# Build application.
 qmake .. "$qmake_args"
 make lrelease
+qmake .. "$qmake_args"
 make
 make install
 
-ls "./usr/bin"
+# Obtain linuxdeployqt.
 wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
 chmod a+x linuxdeployqt-continuous-x86_64.AppImage 
 
+# Create AppImage.
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-./linuxdeployqt-continuous-x86_64.AppImage "./usr/bin/rssguard" -appimage
-ls
\ No newline at end of file
+./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/rssguard.desktop" -appimage -no-translations -always-overwrite
+
+# Upload image.
+git config --global user.email "rotter.martinos@gmail.com"
+git config --global user.name "martinrotter"
+git clone https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki
+
+set -- R*.AppImage
+imagename="$1"
+imagenamenospace="${imagename// /-}-$(git rev-parse --short HEAD)"
+echo "File to upload: $imagename"
+echo "URL ending: $imagenamenospace"
+
+curl --upload-file "./$imagename" "https://transfer.sh/$imagenamenospace" --silent >> ./build-wiki/Linux-development-builds.md
+echo "\n" >> ./build-wiki/Linux-development-builds.md
+
+cd ./build-wiki
+git commit -a -m "New files."
+git pull origin master
+git push origin master
\ No newline at end of file
diff --git a/rssguard.pro b/rssguard.pro
index 7245b3126..538710ec4 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -97,7 +97,7 @@ isEmpty(PREFIX) {
   }
 
   unix:!mac:!android {
-    PREFIX = $$OUT_PWD/usr
+    PREFIX = $$OUT_PWD/AppDir/usr
   }
 }
 
@@ -620,32 +620,12 @@ win32 {
   QMAKE_EXTRA_TARGETS += seven_zip zip
 }
 
-unix:!mac {
-  seven_zip.target = 7zip
-  seven_zip.depends = install
-  seven_zip.commands = 7za a -t7z "$$TARGET-$$APP_VERSION-$$APP_REVISION-linux.7z" $$shell_quote($$shell_path($$PREFIX/*))
-
-  zip.target = zip
-  zip.depends = install
-  zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-linux.zip" $$shell_quote($$shell_path($$PREFIX/*))
-
-  QMAKE_EXTRA_TARGETS += seven_zip zip
-}
-
 mac {
-  seven_zip.target = 7zip
-  seven_zip.depends = install
-  seven_zip.commands = 7za a -t7z "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.7z" $$shell_quote($$shell_path($$PREFIX))
-
-  zip.target = zip
-  zip.depends = install
-  zip.commands = 7za a -tzip "$$TARGET-$$APP_VERSION-$$APP_REVISION-mac.zip" $$shell_quote($$shell_path($$PREFIX))
-
   dmg.target = dmg
   dmg.depends = install
   dmg.commands = macdeployqt $$shell_quote($$shell_path($$PREFIX)) -dmg
 
-  QMAKE_EXTRA_TARGETS += seven_zip zip dmg
+  QMAKE_EXTRA_TARGETS += dmg
 }
 
 # Create NSIS installer target on Windows.
@@ -696,11 +676,13 @@ win32 {
 unix:!mac:!android {
   target.path = $$PREFIX/bin
 
-  # Initial feeds.
   desktop_file.files = resources/desktop/$${TARGET}.desktop
   desktop_file.path = $$quote($$PREFIX/share/applications/)
 
-  INSTALLS += target desktop_file
+  desktop_icon.files = resources/graphics/$${TARGET}.png
+  desktop_icon.path = $$quote($$PREFIX/share/pixmaps/)
+
+  INSTALLS += target desktop_file desktop_icon
 }
 
 android {