mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-15 06:52:34 +02:00
Fix linux ci compilation
This commit is contained in:
parent
bf1fa16d88
commit
893eec7e32
@ -88,6 +88,7 @@ build:linux_debug:
|
|||||||
- check
|
- check
|
||||||
script:
|
script:
|
||||||
- sudo apt-get update -y
|
- sudo apt-get update -y
|
||||||
|
- sudo snap install cqtdeployer
|
||||||
- sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common -y
|
- sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common -y
|
||||||
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
||||||
- sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
- sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
||||||
@ -112,12 +113,13 @@ build:linux_release:
|
|||||||
- check
|
- check
|
||||||
script:
|
script:
|
||||||
- sudo apt-get update -y
|
- sudo apt-get update -y
|
||||||
|
- sudo snap install cqtdeployer
|
||||||
- sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common -y
|
- sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common -y
|
||||||
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
||||||
- sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
- sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
||||||
- sudo apt-get update -y
|
- sudo apt-get update -y
|
||||||
- sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
|
- sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
|
||||||
- cd Tools
|
- cd Tools
|
||||||
- python build.py -t release
|
- python build.py -t release
|
||||||
artifacts:
|
artifacts:
|
||||||
expire_in: '4 weeks'
|
expire_in: '4 weeks'
|
||||||
|
@ -107,7 +107,6 @@
|
|||||||
<file>assets/images/mask.svg</file>
|
<file>assets/images/mask.svg</file>
|
||||||
<file>assets/images/mask_workshop.png</file>
|
<file>assets/images/mask_workshop.png</file>
|
||||||
<file>assets/images/Untitled.png</file>
|
<file>assets/images/Untitled.png</file>
|
||||||
<file>assets/images/window.svg</file>
|
|
||||||
<file>translations/ScreenPlay_zh_cn.qm</file>
|
<file>translations/ScreenPlay_zh_cn.qm</file>
|
||||||
<file>translations/ScreenPlay_de.qm</file>
|
<file>translations/ScreenPlay_de.qm</file>
|
||||||
<file>translations/ScreenPlay_en.qm</file>
|
<file>translations/ScreenPlay_en.qm</file>
|
||||||
|
@ -36,14 +36,16 @@ print("Starting build with type %s. Qt Version: %s" %
|
|||||||
|
|
||||||
cmake_prefix_path = ""
|
cmake_prefix_path = ""
|
||||||
cmake_target_triplet = ""
|
cmake_target_triplet = ""
|
||||||
|
cmake_build_type = ""
|
||||||
executable_file_ending = ""
|
executable_file_ending = ""
|
||||||
deploy_executable = ""
|
deploy_command = ""
|
||||||
|
|
||||||
if platform == "win32":
|
if platform == "win32":
|
||||||
print("Loading MSVC env variables via vsvars32.bat")
|
print("Loading MSVC env variables via vsvars32.bat")
|
||||||
|
cmake_build_type = args.build_type
|
||||||
windows_msvc = "msvc2019_64"
|
windows_msvc = "msvc2019_64"
|
||||||
executable_file_ending = ".exe"
|
executable_file_ending = ".exe"
|
||||||
deploy_executable = "windeployqt.exe"
|
deploy_command = "windeployqt.exe --{type} --qmldir ../../{app}/qml {app}{executable_file_ending}"
|
||||||
dict = vs_env_dict()
|
dict = vs_env_dict()
|
||||||
dict["PATH"] = dict["PATH"] + ";C:\\Qt\\" + qt_version + "\\" + windows_msvc + "\\bin;C:\\Qt\\Tools\\QtCreator\\bin"
|
dict["PATH"] = dict["PATH"] + ";C:\\Qt\\" + qt_version + "\\" + windows_msvc + "\\bin;C:\\Qt\\Tools\\QtCreator\\bin"
|
||||||
os.environ.update(dict)
|
os.environ.update(dict)
|
||||||
@ -52,18 +54,18 @@ if platform == "win32":
|
|||||||
os.system("install_dependencies_windows.bat")
|
os.system("install_dependencies_windows.bat")
|
||||||
elif platform == "darwin":
|
elif platform == "darwin":
|
||||||
cmake_prefix_path = "~/Qt/" + qt_version + "/clang_64"
|
cmake_prefix_path = "~/Qt/" + qt_version + "/clang_64"
|
||||||
deploy_executable = "macdeployqt"
|
deploy_command = "macdeployqt --{type} --qmldir ../../{app}/qml {app}"
|
||||||
cmake_target_triplet = "x64-osx"
|
cmake_target_triplet = "x64-osx"
|
||||||
print("Executing install_dependencies_linux_mac.sh")
|
print("Executing install_dependencies_linux_mac.sh")
|
||||||
os.system("chmod +x install_dependencies_linux_mac.sh")
|
os.system("chmod +x install_dependencies_linux_mac.sh")
|
||||||
os.system("./install_dependencies_linux_mac.sh")
|
os.system("./install_dependencies_linux_mac.sh")
|
||||||
elif platform == "linux":
|
elif platform == "linux":
|
||||||
deploy_executable = "linuxdeployqt"
|
deploy_command = "cqtdeployer -qmldir ../../{app}/qml -bin {app}"
|
||||||
cmake_prefix_path = "~/Qt/"
|
cmake_prefix_path = "~/Qt/" + qt_version + "/gcc_64"
|
||||||
cmake_target_triplet = "x64-linux"
|
cmake_target_triplet = "x64-linux"
|
||||||
print("Executing install_dependencies_linux_mac.sh")
|
print("Executing install_dependencies_linux_mac.sh")
|
||||||
os.system("chmod +x install_dependencies_linux_mac.sh")
|
os.system("chmod +x install_dependencies_linux_mac.sh")
|
||||||
os.system("./install_dependencies_linux_mac.sh")
|
#os.system("./install_dependencies_linux_mac.sh")
|
||||||
|
|
||||||
# REMOVE OLD BUILD FOLDER
|
# REMOVE OLD BUILD FOLDER
|
||||||
cwd = os.getcwd()
|
cwd = os.getcwd()
|
||||||
@ -105,20 +107,21 @@ if process.returncode != 0:
|
|||||||
os.system("cmake --build . --target all")
|
os.system("cmake --build . --target all")
|
||||||
os.chdir("bin")
|
os.chdir("bin")
|
||||||
|
|
||||||
os.system(("{deploy_executable} --{type} --qmldir ../../ScreenPlay/qml ScreenPlay{executable_file_ending}").format(
|
os.system((deploy_command).format(
|
||||||
type=args.build_type,
|
type=cmake_build_type,
|
||||||
executable_file_ending=executable_file_ending,
|
app="ScreenPlay",
|
||||||
deploy_executable=deploy_executable))
|
executable_file_ending=executable_file_ending))
|
||||||
|
|
||||||
os.system(("{deploy_executable} --{type} --qmldir ../../ScreenPlayWidget ScreenPlayWidget{executable_file_ending}").format(
|
os.system((deploy_command).format(
|
||||||
type=args.build_type,
|
type=cmake_build_type,
|
||||||
executable_file_ending=executable_file_ending,
|
app="ScreenPlayWidget",
|
||||||
deploy_executable=deploy_executable))
|
executable_file_ending=executable_file_ending))
|
||||||
|
|
||||||
|
os.system((deploy_command).format(
|
||||||
|
type=cmake_build_type,
|
||||||
|
app="ScreenPlayWallpaper",
|
||||||
|
executable_file_ending=executable_file_ending))
|
||||||
|
|
||||||
os.system(("{deploy_executable} --{type} --qmldir ../../ScreenPlayWallpaper ScreenPlayWallpaper{executable_file_ending}").format(
|
|
||||||
type=args.build_type,
|
|
||||||
executable_file_ending=executable_file_ending,
|
|
||||||
deploy_executable=deploy_executable))
|
|
||||||
|
|
||||||
|
|
||||||
file_endings = [".ninja_deps", ".ninja", ".ninja_log", ".lib", ".exp",
|
file_endings = [".ninja_deps", ".ninja", ".ninja_log", ".lib", ".exp",
|
||||||
|
Loading…
Reference in New Issue
Block a user