From a881444d44f00356d96dc7816ae001018c2303e2 Mon Sep 17 00:00:00 2001
From: Andrei <EndrIIMail@gmail.com>
Date: Thu, 9 May 2019 00:04:22 +0300
Subject: [PATCH] fix qmake installer

---
 .gitignore              |  2 ++
 installer/installer.pri | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0fef427..4657167 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,5 @@ SnakeServer/serverProtocolTests/serverProtocolTests
 deployTests/
 
 installer/SnakeInstaller
+
+OUT/
diff --git a/installer/installer.pri b/installer/installer.pri
index 950ec0a..2d96756 100644
--- a/installer/installer.pri
+++ b/installer/installer.pri
@@ -1,6 +1,7 @@
 QT_DIR = $$dirname(QMAKE_QMAKE)
 QML_DIR = $$PWD/../Snake/
 DEPLOY_TARGET = $$PWD/../Snake/build/release
+DEPLOY_SERVER = $$PWD/../Snake/SnakeServer/Daemon/build/release,$$PWD/../Snake/SnakeServer/Terminal/build/release
 
 
 win32:LUPDATE = $$QT_DIR/lupdate.exe
@@ -44,6 +45,8 @@ win32:REPOGEN=$$first(REPO_LIST).exe
 
 contains(QMAKE_HOST.os, Linux):{
     unix:EXEC=$$first(BINARY_LIST)
+    win32:EXEC=wine $$first(BINARY_LIST).exe
+
     REPOGEN=$$first(REPO_LIST)
 }
 
@@ -90,14 +93,22 @@ for(command, commands) {
     system($$command)|error("Failed to run: $$command")
 }
 
-BASE_DEPLOY_FLAGS = clear -qmake $$QMAKE_QMAKE -targetDir $$PWD/packages/Snake/data -libDir $$PWD/../ -recursiveDepth 5
+INSTALL_SERVER_DIR = ~/SnakeServer
 
-deploy.commands += $$DEPLOYER -bin $$DEPLOY_TARGET -qmlDir $$QML_DIR $$BASE_DEPLOY_FLAGS
+BASE_DEPLOY_FLAGS = clear -qmake $$QMAKE_QMAKE -libDir $$PWD/../ -recursiveDepth 5
+BASE_DEPLOY_FLAGS_SERVER = $$BASE_DEPLOY_FLAGS -targetDir $$INSTALL_SERVER_DIR
+BASE_DEPLOY_FLAGS_SNAKE = $$BASE_DEPLOY_FLAGS -targetDir $$PWD/packages/Snake/data
 
-release.commands = $$EXEC \
+deploy_dep.commands += $$DEPLOYER -bin $$DEPLOY_TARGET -qmlDir $$QML_DIR $$BASE_DEPLOY_FLAGS_SNAKE
+
+mkpath( $$PWD/../OUT)
+
+deploy.commands = $$EXEC \
                        -c $$PWD/config/config.xml \
                        -p $$PWD/packages \
-                       $$PWD/$$OUT_FILE
+                       $$PWD/../OUT/$$OUT_FILE
+
+deploy.depends = deploy_dep
 
 ONLINE_REPO_DIR = $$ONLINE
 
@@ -113,11 +124,11 @@ message( ONLINE_REPO_DIR $$ONLINE_REPO_DIR)
 
     release.depends = create_repo
 
-    release.commands = $$EXEC \
+    deploy.commands = $$EXEC \
                            --online-only \
                            -c $$PWD/config/config.xml \
                            -p $$PWD/packages \
-                           $$PWD/$$OUT_FILE
+                           $$PWD/../OUT/$$OUT_FILE
 }
 
 OTHER_FILES += \
@@ -129,10 +140,25 @@ OTHER_FILES += \
     $$PWD/packages/Installer/data/app.check \
     $$PWD/packages/Snake/meta/* \
 
+installSnake.commands = $$DEPLOYER -bin $$DEPLOY_SERVER $$BASE_DEPLOY_FLAGS_SERVER
+
+createLinks.commands = ln -s $$INSTALL_SERVER_DIR/Terminal.sh ~/.local/bin/snake-term && \
+                       ln -s $$INSTALL_SERVER_DIR/SnakeServer-daemon.sh ~/.local/bin/snake-d
+
+
+runServer.commands = snake-d daemon
 
 release.depends += deploy
+release.depends += installSnake
+release.depends += createLinks
+release.depends += runServer
+
 
 QMAKE_EXTRA_TARGETS += \
+    installSnake \
+    createLinks \
+    runServer \
+    deploy_dep \
     deploy \
     create_repo \
     release \