mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-22 10:42:29 +01:00
Merge remote-tracking branch 'origin/161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow' into 161-refactor-screenplaywallpaper-to-no-longer-inherit-from-basewindow
This commit is contained in:
commit
a90f2a8fc3
123
.vscode/tasks.json
vendored
123
.vscode/tasks.json
vendored
@ -1,94 +1,113 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"type": "cmake",
|
||||
"label": "CMake: build",
|
||||
"command": "build",
|
||||
"targets": [
|
||||
"all"
|
||||
],
|
||||
"preset": "${command:cmake.activeBuildPresetName}",
|
||||
"group": "build",
|
||||
"problemMatcher": [],
|
||||
"detail": "CMake template build task"
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
"version": "2.0.0",
|
||||
"tasks": [
|
||||
{
|
||||
"type": "cmake",
|
||||
"label": "CMake: build",
|
||||
"command": "build",
|
||||
"targets": [
|
||||
"all"
|
||||
],
|
||||
"preset": "${command:cmake.activeBuildPresetName}",
|
||||
"group": "build",
|
||||
"problemMatcher": [],
|
||||
"detail": "CMake template build task"
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
"label": "Format Cpp files",
|
||||
"command": "python3",
|
||||
"windows": { "command": "python" },
|
||||
"windows": {
|
||||
"command": "python"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"args": [
|
||||
"clang_format.py"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
{
|
||||
"type": "process",
|
||||
"label": "Format CMake files",
|
||||
"command": "python3",
|
||||
"windows": { "command": "python" },
|
||||
"windows": {
|
||||
"command": "python"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"args": [
|
||||
"cmake_format.py"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
{
|
||||
"type": "process",
|
||||
"label": "Format Qml files",
|
||||
"command": "python3",
|
||||
"windows": { "command": "python" },
|
||||
"windows": {
|
||||
"command": "python"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"args": [
|
||||
"qml_format.py"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
{
|
||||
"type": "process",
|
||||
"label": "Run setup.py",
|
||||
"command": "python3",
|
||||
"windows": { "command": "python" },
|
||||
"windows": {
|
||||
"command": "python"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"args": [
|
||||
"setup.py"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
{
|
||||
"type": "process",
|
||||
"label": "Export ScreenPlay release, with deploy and steam enabled",
|
||||
"command": "python3",
|
||||
"windows": { "command": "python" },
|
||||
"windows": {
|
||||
"command": "python"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"osx": {
|
||||
"args": [
|
||||
"build.py",
|
||||
"-type=release",
|
||||
"-deploy-version",
|
||||
"-steam",
|
||||
"-architecture=arm64"
|
||||
]
|
||||
},
|
||||
"args": [
|
||||
"build.py",
|
||||
"-type=release",
|
||||
@ -96,21 +115,23 @@
|
||||
"-steam"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "process",
|
||||
{
|
||||
"type": "process",
|
||||
"label": "Update Qt *.ts translations",
|
||||
"command": "python3",
|
||||
"windows": { "command": "python" },
|
||||
"windows": {
|
||||
"command": "python"
|
||||
},
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}/Tools"
|
||||
},
|
||||
"args": [
|
||||
"update_translations.py"
|
||||
]
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue
Block a user