Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.gitlab-ci.yml
This commit is contained in:
Elias Steurer 2022-07-22 14:31:19 +02:00
commit b53f20bb8e
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.gitlab-ci.yml
View File

@ -6,7 +6,7 @@ stages:
variables:
GIT_STRATEGY: clone
QT_VERSION: 6.3.0
QT_VERSION: 6.3.1
PYTHON_VERSION: 3.10.1
check:
@ -73,12 +73,15 @@ build:osx_release:
- python3 -m aqt install-tool -O ../aqt mac desktop tools_ifw
- cd Tools
- python3 setup.py
- python3 build.py -type release -use-aqt -installer
- python3 build.py -type release -use-aqt -installer -architecture x64
- python3 build.py -type release -use-aqt -installer -architecture arm64
artifacts:
expire_in: "4 weeks"
paths:
- build-x64-osx-release/bin/
- build-arm-osx-release/bin/
- build-x64-osx-release/ScreenPlay-Installer.dmg
- build-arm-osx-release/ScreenPlay-Installer.dmg
build:osx_release_steam:
stage: build
@ -91,11 +94,15 @@ build:osx_release_steam:
- python3 -m aqt install-tool -O ../aqt mac desktop tools_ifw
- cd Tools
- python3 setup.py
- python3 build.py -type release -steam -use-aqt -installer
- python3 build.py -type release -steam -use-aqt -installer -architecture x64
- python3 build.py -type release -steam -use-aqt -installer -architecture arm64
artifacts:
expire_in: "4 weeks"
paths:
- build-x64-osx-release/bin/
- build-arm-osx-release/bin/
- build-x64-osx-release/ScreenPlay-Installer.dmg
- build-arm-osx-release/ScreenPlay-Installer.dmg
build:linux_release:
stage: build
@ -162,6 +169,7 @@ release:windows_standalone:
expire_in: "never"
paths:
- build-x64-windows-release/bin/
- build-x64-windows-release/ScreenPlay-Installer.exe
release:osx_steam:
stage: build
@ -174,13 +182,17 @@ release:osx_steam:
- python -m aqt install-tool -O ../aqt mac desktop tools_ifw
- cd Tools
- python3 setup.py
- python3 build.py -type release -steam -use-aqt -sign
- python3 build.py -type release -steam -use-aqt -sign -architecture x64
- python3 build.py -type release -steam -use-aqt -sign -architecture arm64
only:
- release
artifacts:
expire_in: "never"
paths:
- build-x64-osx-release/bin/
- build-arm-osx-release/bin/
- build-x64-osx-release/ScreenPlay-Installer.dmg
- build-arm-osx-release/ScreenPlay-Installer.dmg
release:osx_standalone:
stage: build
@ -193,13 +205,16 @@ release:osx_standalone:
- python3 -m aqt install-tool -O ../aqt mac desktop tools_ifw
- cd Tools
- python3 setup.py
- python3 build.py -type release -installer -use-aqt -sign
- python3 build.py -type release -installer -use-aqt -sign
only:
- release
artifacts:
expire_in: "never"
paths:
- build-x64-osx-release/bin/
- build-arm-osx-release/bin/
- build-x64-osx-release/ScreenPlay-Installer.dmg
- build-arm-osx-release/ScreenPlay-Installer.dmg
release:linux_steam:
stage: build

4
CMakePresets.json
View File

@ -18,7 +18,7 @@
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "C:/Qt/6.3.0/msvc2019_64",
"CMAKE_PREFIX_PATH": "C:/Qt/6.3.1/msvc2019_64",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../ScreenPlay-vcpkg/scripts/buildsystems/vcpkg.cmake",
"VCPKG_TARGET_TRIPLET": "x64-windows"
}
@ -35,7 +35,7 @@
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "~/aqt/6.3.0/gcc_64",
"CMAKE_PREFIX_PATH": "~/aqt/6.3.1/gcc_64",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../ScreenPlay-vcpkg/scripts/buildsystems/vcpkg.cmake",
"VCPKG_TARGET_TRIPLET": "x64-linux"
}

12
Docs/DeveloperSetup.md
View File

@ -25,7 +25,7 @@ py setup.py
</div>
5. Open __QtCreator__ and open the settings `Tools -> Options`
6. Clone an existing kit like `Qt 6.3.0 MSVC2019 64bit` and add `ScreenPlay` to the new kit name
6. Clone an existing kit like `Qt 6.3.1 MSVC2019 64bit` and add `ScreenPlay` to the new kit name
5. Edit CMake variables amd add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
* `Kits -> <Your_Kit> -> CMake Configuration`
@ -54,7 +54,7 @@ Append this:
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 6.3.0
- Qt 6.3.1
- MSVC 2019 64-bit
- **ALL Additional Libraries**
- Qt Quick 3d
@ -72,7 +72,7 @@ sudo apt install build-essential git gpg ffmpeg mesa-common-dev libxkbcommon-
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 6.3.0
- Qt 6.3.1
- GCC
- **ALL Additional Libraries**
- Qt Quick 3d
@ -88,7 +88,7 @@ sudo apt install build-essential git gpg ffmpeg mesa-common-dev libxkbcommon-
```
pip3 install -U pip
pip3 install aqtinstall
aqt install-qt -O ~/aqt linux desktop 6.3.0 gcc_64 -m all
aqt install-qt -O ~/aqt linux desktop 6.3.1 gcc_64 -m all
```
1. Open VSCode and install the `CMake Tools`
1. ctrl + p: `CMake: Select Configure Preset`
@ -110,7 +110,7 @@ export PATH="~/.local/bin:$PATH"
1. [Download and install Qt binary installer from qt.io](https://www.qt.io/download-qt-installer)
- Install the Maintaince tool
- Select the following features to install:
- Qt 6.3.0
- Qt 6.3.1
- Qt WebEngine
- **ALL Additional Libraries**
- Qt Quick 3d
@ -122,7 +122,7 @@ export PATH="~/.local/bin:$PATH"
- Cmake
- Ninja
1. Change your default kit:
- `QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 6.3.0) -> Change c and c++ Compiler to Apple Clang (x86_64)`
- `QtCreator -> Options -> Kits -> Select your default kit (Desktop Qt 6.3.1) -> Change c and c++ Compiler to Apple Clang (x86_64)`
# Developer docs

12
Tools/build.py
View File

@ -107,6 +107,8 @@ def build(
f"aqt path does not exist at {aqt_path}. Please make sure you have installed aqt.")
exit(2)
CMAKE_OSX_ARCHITECTURES: str = ""
deploy_command: str = ""
executable_file_ending: str = ""
qt_path: str = ""
@ -136,11 +138,14 @@ def build(
elif platform.system() == "Darwin":
if(build_architecture == "arm64"):
cmake_target_triplet = "arm64-osx"
CMAKE_OSX_ARCHITECTURES = "-DCMAKE_OSX_ARCHITECTURES=arm64"
elif(build_architecture == "x64"):
cmake_target_triplet = "x64-osx"
CMAKE_OSX_ARCHITECTURES = "-DCMAKE_OSX_ARCHITECTURES=x86_64"
else:
print("MISSING BUILD ARCH: SET arm64 or x64")
exit(1)
qt_path = aqt_path if use_aqt else Path("~/Qt/")
qt_bin_path = aqt_path.joinpath(
f"{qt_version}/macos") if use_aqt else Path(f"~/Qt/{qt_version}/macos")
@ -191,11 +196,6 @@ def build(
f"build-{cmake_target_triplet}-{build_type}")
clean_build_dir(build_folder)
CMAKE_OSX_ARCHITECTURES: str = ""
# The entire parameter should be optional. We need this to explicity build
# x84 and arm version seperat, only because we cannot compile two at once with vcpkg
if build_architecture:
CMAKE_OSX_ARCHITECTURES = f"-DCMAKE_OSX_ARCHITECTURES={build_architecture}"
cmake_configure_command = f'cmake ../ \
{CMAKE_OSX_ARCHITECTURES} \
@ -379,7 +379,7 @@ if __name__ == "__main__":
help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
args = parser.parse_args()
qt_version = "6.3.0"
qt_version = "6.3.1"
qt_ifw_version = "4.4" # Not yet used.
qt_version_overwrite = ""
use_aqt = False