From d100aca5fc0ff41761dbd887c4441814098bad4d Mon Sep 17 00:00:00 2001
From: Andreas Stallinger <astallinger@gmail.com>
Date: Wed, 10 May 2017 16:09:43 +0200
Subject: [PATCH] build: gitlab-ci names for artifacts

* names for gitlab artifacts
* fix Linux package qt platforms lib
---
 .gitlab-ci.yml           | 14 +++++++++-----
 cmake/LinuxPackage.cmake | 12 +++++-------
 script/buildonly.sh      |  4 ++--
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d34f631..beaa7be2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,11 +12,12 @@ Linux64:
         - cd ./bin/test
         - ../../build/Release/test/Sourcetrail_test
     artifacts:
+        name: "$CI_JOB_NAME"
         paths:
-            - distr/Sourcetrail*.tar.gz
+            - Sourcetrail*.tar.gz
         expire_in: 3 days
 
-Linux64_tagged:
+Linux64_tag:
     image: st4ll1/coati_linux_64
     stage: deploy
     only:
@@ -29,8 +30,9 @@ Linux64_tagged:
         - cd ./bin/test
         - ../../build/Release/test/Sourcetrail_test
     artifacts:
+        name: "$CI_JOB_NAME"
         paths:
-            - distr/Sourcetrail*.tar.gz
+            - Sourcetrail*.tar.gz
 
 Linux32:
     image: st4ll1/coati_linux_32
@@ -46,8 +48,9 @@ Linux32:
         - cd ./bin/test
         - ../../build/Release/test/Sourcetrail_test
     artifacts:
+        name: "$CI_JOB_NAME"
         paths:
-            - distr/Sourcetrail*.tar.gz
+            - Sourcetrail*.tar.gz
         expire_in: 3 days
 
 Linux32_tag:
@@ -63,5 +66,6 @@ Linux32_tag:
         - cd ./bin/test
         - ../../build/Release/test/Sourcetrail_test
     artifacts:
+        name: "$CI_JOB_NAME"
         paths:
-            - distr/Sourcetrail*.tar.gz
+            - Sourcetrail*.tar.gz
diff --git a/cmake/LinuxPackage.cmake b/cmake/LinuxPackage.cmake
index 6e7f2743..7063163b 100644
--- a/cmake/LinuxPackage.cmake
+++ b/cmake/LinuxPackage.cmake
@@ -96,13 +96,11 @@ function(AddSharedToComponent componentName)
 	GetAndInstallLibrary(libdrm.so ${componentName})
 	GetAndInstallLibrary(libXau.so ${componentName})
 
-	if ( $ENV{QT_DIR})
-		INSTALL(DIRECTORY
-			$ENV{QT_DIR}/plugins/platforms
-			DESTINATION Sourcetrail/lib
-			COMPONENT ${componentName}
-		)
-	endif()
+	INSTALL(DIRECTORY
+		$ENV{QT_DIR}/plugins/platforms
+		DESTINATION Sourcetrail/lib
+		COMPONENT ${componentName}
+	)
 
 	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
 		DESTINATION Sourcetrail
diff --git a/script/buildonly.sh b/script/buildonly.sh
index bbd7d75b..393f556b 100755
--- a/script/buildonly.sh
+++ b/script/buildonly.sh
@@ -39,8 +39,8 @@ then
 elif [ "$1" = "package" ] || [ "$1" = "p" ]
 then
 		cmake --build build/Release --target package
-		mkdir -p distr && mv build/Release/Sourcetrail*.tar.gz distr #&& cp build/Release/Sourcetrail*.deb distr
-		echo "Packages copied into the distr folder"
+		mv build/Release/Sourcetrail*.tar.gz . #&& cp build/Release/Sourcetrail*.deb distr
+		echo "Packages copied into the root folder"
 elif [ "$1" = "all" ] || [ "$1" = "a" ]
 then
 	cmake --build build/Release --target all