From 5164a7b916dc30fe7de783723138f1402ebccdfe Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Sun, 16 May 2021 13:12:24 +0200
Subject: [PATCH] Change CI to use setup.py

---
 .gitlab-ci.yml | 6 ++++++
 Tools/build.py | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0fe7566..269f46de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ build:windows_debug:
         - check
     script:
         - cd Tools
+        - python setup.py
         - python build.py -t debug
     artifacts:
         expire_in: "4 weeks"
@@ -40,6 +41,7 @@ build:windows_release:
         - check
     script:
         - cd Tools
+        - python setup.py
         - python build.py -t release
     artifacts:
         expire_in: "4 weeks"
@@ -55,6 +57,7 @@ build:osx_debug:
         - check
     script:
         - cd Tools
+        - python3 setup.py
         - python3 build.py -t debug
     artifacts:
         expire_in: "4 weeks"
@@ -70,6 +73,7 @@ build:osx_release:
         - check
     script:
         - cd Tools
+        - python3 setup.py
         - python3 build.py -t release
     artifacts:
         expire_in: "4 weeks"
@@ -96,6 +100,7 @@ build:linux_debug:
         - sudo apt-get update -y
         - sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
         - cd Tools
+        - python setup.py
         - python build.py -t debug
     artifacts:
         expire_in: "4 weeks"
@@ -122,6 +127,7 @@ build:linux_release:
         - sudo apt-get update -y
         - sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
         - cd Tools
+        - python setup.py
         - python build.py -t release
     artifacts:
         expire_in: "4 weeks"
diff --git a/Tools/build.py b/Tools/build.py
index b51e8a71..1ae4b293 100644
--- a/Tools/build.py
+++ b/Tools/build.py
@@ -51,21 +51,14 @@ if platform == "win32":
     os.environ.update(dict)
     cmake_prefix_path = "c:/Qt/" + qt_version + "/" + windows_msvc
     cmake_target_triplet = "x64-windows"
-    os.system("install_dependencies_windows.bat")
 elif platform == "darwin":
     cmake_prefix_path = "~/Qt/" + qt_version + "/clang_64"
     deploy_command = "{prefix_path}/bin/macdeployqt {app}.app  -qmldir=../../{app}/qml "
     cmake_target_triplet = "x64-osx"
-    print("Executing install_dependencies_linux_mac.sh")
-    os.system("chmod +x install_dependencies_linux_mac.sh")
-    os.system("./install_dependencies_linux_mac.sh")
 elif platform == "linux":
     deploy_command = "cqtdeployer -qmldir ../../{app}/qml -bin {app}"
     cmake_prefix_path = "~/Qt/" + qt_version + "/gcc_64"
     cmake_target_triplet = "x64-linux"
-    print("Executing install_dependencies_linux_mac.sh")
-    os.system("chmod +x install_dependencies_linux_mac.sh")
-    #os.system("./install_dependencies_linux_mac.sh")
 
 # REMOVE OLD BUILD FOLDER
 cwd = os.getcwd()