1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00
Commit Graph

90 Commits

Author SHA1 Message Date
Elias Steurer
58567987aa Remove ScreePlay version from defines.py
We now use always the latest set git tag as version.
This means we also no longer need to add it as an argument
2023-08-17 14:26:39 +02:00
Elias Steurer
ebff53948c Change build args to have double -
Split builds into regular and official
git tag release builds
2023-08-12 11:53:34 +02:00
Elias Steurer
efc70e9fc0 Change CI to split into multile sections
Change version to be only set via git tags
2023-08-11 17:00:24 +02:00
Elias Steurer
dfd311c5d5 Merge commit 'e85c5ac6b69f38976521f9fd842f5b5a47c08cc9'
# Conflicts:
#	Tools/defines.py
2023-06-02 13:25:42 +02:00
Elias Steurer
287730e9c7 Change macos building fat universal binary as default
For this we now use a custom triplet. This has some drawbacks like openssl
does not work with this config. Luckily we can
use openssl that is provided by Qt. On macOS
they use Secure Transport.
2023-06-02 09:51:56 +02:00
Elias Steurer
db9d319388 Add Qt 6.5 looping workaround
Remove Qt6Widgets workaround

Update to latest vcpkg
Update to latest plausible-qml
Update to latest QArchive
2023-02-16 13:06:50 +01:00
Elias Steurer
ef8b31c18b Fix resetting the cmake_osx_architectures 2023-02-11 15:17:50 +01:00
Elias Steurer
858e72e066 Default to x64 for first build on osx 2023-02-11 14:12:44 +01:00
Elias Steurer
06b7306173 Fix missing triplet and architecture 2023-02-11 13:23:32 +01:00
Elias Steurer
515e57d280 Remove workaround 2023-02-11 13:10:54 +01:00
Elias Steurer
6e2cecddb3 Fix compilation and signing
Move TrayIcon back to ScreenPlay:
- This fixes the missing labs plugins when running the macdeployqt script
- We don't need it here only in the SP main folder anyway

Move building and sign of the osx version for x64 and arm64 into the
actual build script.

Remove the qml plugin path workaround from the addImportPath
2023-02-11 11:57:09 +01:00
Elias Steurer
19ce4ce823 Fix sign script 2023-02-04 17:53:57 +01:00
Elias Steurer
abddca8685 Remove seperate .app for wallpaper and widgets 2023-02-04 17:34:59 +01:00
Elias Steurer
d07d26eefb Add deploy workaround for QTBUG-110937 2023-02-04 16:00:57 +01:00
Elias Steurer
6f5fabeb0e Add qtconnectivity to fix windeploqt and macdeployqt
For some reason scene2d.dll need Qt6Bluetooth. What even is scene2d?
2023-02-03 10:16:39 +01:00
Elias Steurer
31005092be Bump version to 0.15.0-RC5 2023-01-29 13:26:36 +01:00
Elias Steurer
7871573179 Update to use SPDX-License-Identifier 2023-01-19 10:33:49 +01:00
Elias Steurer
04c86508ef Remove Qt Maintanance build in favor of aqt
Update osx steam contentbuilder bins
Add skip build option
2023-01-05 13:42:58 +01:00
Elias Steurer
b5aa584337 Remove Qt Maintenance tool requirement 2022-12-16 13:34:15 +01:00
Elias Steurer
07ffd812b1 Remove hardcoded IFW version 2022-11-11 13:09:16 +01:00
Elias Steurer
04e34f9358 Add newline to cmake arguments 2022-11-04 16:31:26 +01:00
Elias Steurer
aeae7ce07e Fix zip containing paths 2022-11-02 16:29:35 +01:00
Elias Steurer
01c458a5f5 Fix variable 2022-11-02 13:28:54 +01:00
Elias Steurer
6e320c0b50 Revert QArchive update
this caused compilation errors for time

Add duration prints to build.py
2022-11-02 12:56:34 +01:00
Elias Steurer
00c051da9a Update python to output utf-8 2022-11-02 12:15:34 +01:00
Elias Steurer
0acab25bde Fix aqt path on osx 2022-10-14 11:54:00 +02:00
Elias Steurer
bda6716d3a Refactor build &ci script to use aqt
Refactor gitlab-ci to inherit base
Add defines.py that stores variables like versions
Bump Qt version to 6.3.2
2022-10-10 11:35:41 +02:00
Elias Steurer
73078edee6 Fix macOS universal signing 2022-08-26 15:45:49 +02:00
Elias Steurer
cd5933a7e4 Refactor CI to only include what we currently use
Refactor osx build with universal binary support
Rename release to deploy version to make it less confusing
2022-08-14 11:58:41 +02:00
Elias Steurer
472e341440 Fix to only zip installer if we have one 2022-08-07 18:20:16 +02:00
Elias Steurer
8ca09c684d Add automatic build uploads to kelteseth.com
Add choco build and docs for pushing
2022-08-07 12:24:07 +02:00
Elias Steurer
773ef8317b Remove linux deploy command
linuxdeploqt is awful and we simply copy
everything from qt
2022-07-29 16:08:25 +02:00
Elias Steurer
c96263eb1d Add missing screenplay_version 2022-07-29 15:34:01 +02:00
Elias Steurer
46dd20a796 Fix function with the same name as a parameter
Fix missing executable_file_ending
2022-07-29 15:24:45 +02:00
Elias Steurer
671866de60 Fix missing aqt option 2022-07-29 14:56:45 +02:00
Elias Steurer
f5bb79d160 Rewrite of build.py to use classes and functions
2 classes that old the data that later will be
used for the ftp upload and other tools
2022-07-24 17:56:00 +02:00
Elias Steurer
717a182af8 Fix cmake argument
x64 argument by vcpkg is
x86_64 in cmake...

Update to Qt 6.3.1
2022-07-22 14:18:04 +02:00
Elias Steurer
3a917c18c4 Update macos build scripts 2022-07-22 13:21:30 +02:00
Elias Steurer
376e96f96c Add macos folder copy for qml folder 2022-07-15 13:05:47 +02:00
Elias Steurer
4db3591c66 Add explicit x86_64 and arm64 build option for mac
VCPKG cannot compile two architectures at once.
We still need to combine the created Apps into a fat binary.
2022-07-15 12:43:57 +02:00
Elias Steurer
1f80ba90ca Refactor build and publish scripts
Add mac arm support
Refactor build and publish build build
2022-07-09 13:05:42 +02:00
Elias Steurer
7773bdb148 Merge remote-tracking branch 'origin/master' 2022-07-08 12:50:37 +02:00
Elias Steurer
bf199ab001 Add explicit SCREENPLAY_RELEASE option
For now this disables setting autostart path on
dev builds. This is annoying because it previously
did set the path to the ScreenPlay dev build that
did have all the dlls and thus fails.
2022-07-08 12:49:53 +02:00
Elias Steurer
a5ca4c7796 Add explicit arm64-osx support to the build script
Add not yet used download_qt.py
2022-07-08 12:33:26 +02:00
Elias Steurer
169b00091b Fix installer argument 2022-05-20 15:52:32 +02:00
Elias Steurer
4da09711e6 Merge remote-tracking branch 'origin/HEAD' 2022-05-12 14:36:18 +02:00
Elias Steurer
bf2aa2d1fa Add osx universal builds 2022-05-06 17:23:14 +02:00
Elias Steurer
40bfa967eb Fix build when only msvc2019 is installed 2022-04-24 09:56:50 +02:00
Elias Steurer
41967b541c Fix none steam builds and installer
Refactor Navigation to use Qt style navigation
2022-04-23 19:26:55 +02:00
Elias Steurer
77a81451ca Multiple refactoring....
Bump Qt to 6.3 to fix video loop
Remove no longer working shader and add new
WIP: Shader compilation path is wrong for some reason
Add Steamless version content path
Remove cmake-format: sortable from CMakeLists.txt
Add Widnow scale indocator icon to the bottom right
Remove unused doctest and benchmark
Fix tests and installer cmake logic
2022-04-04 18:06:43 +02:00