Fix IFW path on linux ci

.gitlab-ci.yml

@@ -137,19 +137,17 @@ build:linux_release:
     needs:
         - check
     script:
-        - apt-get update -y
+        - apt update -y
         # Otherwise libglib2 needs interaction
         - export DEBIAN_FRONTEND=noninteractive
-        - apt-get install mesa-common-dev curl zip unzip tar git pkg-config apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip build-essential libgl1-mesa-dev lld ninja-build cmake -y
+        - apt install mesa-common-dev curl zip unzip tar git pkg-config apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip build-essential libgl1-mesa-dev lld ninja-build cmake -y
         - pip3 install -U pip
         - pip3 install aqtinstall
-        - mkdir Qt
         - aqt install-qt -O ../aqt linux desktop $QT_VERSION gcc_64 -m all
         - aqt install-tool -O ../aqt linux desktop tools_ifw
-        # - wget -q https://github.com/QuasarApp/CQtDeployer/releases/download/1.5.2/CQtDeployer_1.5.2_OfflineInstaller_Linux64.run
         - curl -OL $CQTDEPLOYER_URL
         - chmod +x ./CQtDeployer_*.deb
-        - apt-get install ./CQtDeployer_*.deb -y
+        - apt install ./CQtDeployer_*.deb -y
         - python3 ./Tools/setup.py
         - python3 ./Tools/build.py -type release -steam -use-aqt -installer
     artifacts:

CMake/CreateIFWInstaller.cmake

@@ -1,11 +1,17 @@
 # Variable must be around "" to be equal!
 if("${CPACK_IFW_ROOT}" STREQUAL "")
+
     # Hardcoded Qt paths that are used by the QtMaintanance tool for now...
     if(WIN32)
         set(SCREENPLAY_IFW_ROOT "C:/Qt/Tools/QtInstallerFramework/4.2")
     elseif(UNIX)
+        if(${GITLAB_CI})
+            set(SCREENPLAY_IFW_ROOT "${CMAKE_SOURCE_DIR}/../aqt/Tools/QtInstallerFramework/4.2")
+        else()
             set(SCREENPLAY_IFW_ROOT "$ENV{HOME}/Qt/Tools/QtInstallerFramework/4.2")
         endif()
+    endif()
+
     message(STATUS "[CPACK_IFW_ROOT] Not set. Using hardcoded value: ${SCREENPLAY_IFW_ROOT}")
     message(STATUS "WARNING: MAKE SURE YOU HAVE THIS EXACT VERSION INSTALLED VIA THE QTMAINTANANCE TOOL!")
 else()

CMakeLists.txt

@@ -17,6 +17,10 @@ option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary c
 option(SCREENPLAY_TESTS "Enables UI tests." OFF)
 option(SCREENPLAY_CREATE_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF)
 
+# Gitlab CI has many ENV variables. We use this one to check if the current build happens inside the CI
+if(DEFINED ENV{CI_COMMIT_MESSAGE})
+    set(GITLAB_CI true)
+endif()
 
 # Add our *.cmake diretory to the CMAKE_MODULE_PATH, so that our includes are found
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})

Tools/build.py

@@ -19,7 +19,6 @@ cmake_build_type = ""
 executable_file_ending = ""
 deploy_command = ""
 aqt_path = ""
-ifw_root_path = ""
 cmake_bin_path = ""
 
 file_endings = [".ninja_deps", ".ninja", ".ninja_log", ".lib", ".a", ".dylib", ".exp",
@@ -141,7 +140,6 @@ if __name__ == "__main__":
 		build_tests =  "ON"
 	if args.create_installer:
 		create_installer =  "ON"
-		ifw_root_path =  ("{aqt_path}\\Tools\\QtInstallerFramework\\4.2").format(aqt_path=aqt_path)
 
 	cmake_configure_command = 'cmake ../ \
 -DCMAKE_PREFIX_PATH={prefix_path} \
@@ -151,7 +149,6 @@ if __name__ == "__main__":
 -DSCREENPLAY_STEAM={steam} \
 -DSCREENPLAY_TESTS={tests} \
 -DSCREENPLAY_CREATE_INSTALLER={installer} \
--DSCREENPLAY_IFW_ROOT:STRING={ifw} \
 -G "CodeBlocks - Ninja" \
 -B.'.format(
 		prefix_path=qt_path,
@@ -160,8 +157,7 @@ if __name__ == "__main__":
 		toolchain=cmake_toolchain_file,
 		steam=steam_build,
 		tests = build_tests,
-		installer= create_installer,
-		ifw= ifw_root_path)
+		installer= create_installer)
 
 	build_folder = root_path.joinpath(f"build-{cmake_target_triplet}-{args.build_type}")
 	clean_build_dir(build_folder)