Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 08:22:33 +02:00
Code Issues Projects Releases Activity

Fix python command

Browse Source 
Fix remove outdated order
This commit is contained in:
Elias Steurer 2022-10-14 11:30:26 +02:00
parent bda6716d3a
commit 5df7c39259
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/defines.py
View File

@ -6,3 +6,4 @@ QT_VERSION = "6.3.2"
QT_IFW_VERSION = "4.4"
SCREENPLAY_VERSION = "0.15.0-RC1"
AQT_PATH = Path("C:/aqt") if sys.platform == "win32" else Path("~/aqt")
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"

12
Tools/setup.py
View File

@ -1,16 +1,11 @@
#!/usr/bin/python3
from install_requirements import install_requirements
install_requirements()
from platform import system
from pathlib import Path
from execute_util import execute
import download_ffmpeg
import defines
import argparse
import sys
import util
import datetime
@ -47,13 +42,13 @@ def download(aqt_path: Path, qt_platform: Path):
# aqt list-qt windows desktop --modules 6.2.0 win64_msvc2019_64
qt_packages = "qt3d qt5compat qtimageformats qtmultimedia qtshadertools qtquick3d qtwebengine qtwebsockets qtwebview qtpositioning"
print(f"Downloading: {qt_packages} to {aqt_path}")
execute(f"python -m aqt install-qt -O {aqt_path} windows desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} windows desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")
# Tools can only be installed one at the time:
# see: aqt list-tool windows desktop
tools = ["tools_ifw", "tools_qtcreator", "tools_ninja" ,"tools_cmake"]
for tool in tools:
execute(f"python -m aqt install-tool -O {aqt_path} windows desktop {tool}")
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-tool -O {aqt_path} windows desktop {tool}")
def setup_qt():
@ -138,10 +133,11 @@ def main():
execute("git clone https://github.com/microsoft/vcpkg.git ScreenPlay-vcpkg", project_source_parent_path, True)
execute("git fetch", vcpkg_path)
execute("git checkout {}".format(defines.VCPKG_VERSION), vcpkg_path)
execute(f"{vcpkg_command} remove --outdated --recurse", vcpkg_path, False)
# Setup vcpkg via boostrap script first
platform_command.execute_commands() # Execute platform specific commands.
execute(f"{vcpkg_command} remove --outdated --recurse", vcpkg_path, False)
for triplet in vcpkg_triplet:
vcpkg_packages = " ".join(vcpkg_packages_list)