Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Update vpckg and make sure it is clean

Browse Source
This commit is contained in:
Elias Steurer 2023-12-08 14:25:20 +01:00
parent 2809eab14c
commit fa9d259f35
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/defines.py
View File

@ -25,8 +25,8 @@ QT_VERSION = "6.6.1"
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
QT_IFW_VERSION = "4.6"
# 25.11.2023 https://gitlab.com/kelteseth/screenplay-vcpkg :
VCPKG_VERSION = "cabba0d0379b78e34d0a0d37edb4c459c5a03337"
# 8.12.2023 https://github.com/microsoft/vcpkg :
VCPKG_VERSION = "2a6371b01420d8820d158b4707e79931feba27aa"
VCPKG_BASE_PACKAGES = [
"curl",
"openssl",

9
Tools/setup.py
View File

@ -7,6 +7,7 @@ import download_ffmpeg
import defines
import argparse
import util
import shutil
import macos_make_universal
import datetime
import setup_godot
@ -106,7 +107,7 @@ def main():
parser = argparse.ArgumentParser(
description='Build and Package ScreenPlay')
parser.add_argument('--skip-aqt', action="store_true", dest="skip_aqt",
help="Downloads QtCreator and needed binaries Windows: C:\\aqt\\nLinux & macOS:~/aqt/.")
help="Downloads needed Qt binaries Windows")
args = parser.parse_args()
root_path = Path(util.cd_repo_root_path())
@ -149,8 +150,12 @@ def main():
else:
raise NotImplementedError("Unknown system: {}".format(system()))
if vcpkg_path.exists():
print(f"Deleting exisitng vcpkg: {vcpkg_path}")
shutil.rmtree(str(vcpkg_path))
print(f"Clone into {vcpkg_path}")
execute("git clone https://github.com/microsoft/vcpkg vcpkg",
execute("git clone --depth 1 https://github.com/microsoft/vcpkg vcpkg",
project_source_parent_path, True)
execute("git fetch", vcpkg_path)
execute(f"git checkout {defines.VCPKG_VERSION}", vcpkg_path)