Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Code Issues Projects Releases Activity
2,633 Commits 19 Branches 35 Tags 192 MiB
165-pack-screenplay-into-a-single-app-on-osx
Commit Graph

174 Commits

Author SHA1 Message Date
Elias Steurer
5df7c39259 Fix python command 
Fix remove outdated order
 2022-10-14 11:30:26 +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
ab247040f9 Update choco hash 2022-08-27 17:50:59 +02:00
Elias Steurer
30b759953a Merge remote-tracking branch 'origin/master' 2022-08-26 15:48:48 +02:00
Elias Steurer
73078edee6 Fix macOS universal signing 2022-08-26 15:45:49 +02:00
Elias Steurer
3e283aa5d5 Update SteamSDK to 1.55 
Add ContentBuilder tools
 2022-08-26 15:43:50 +02:00
Elias Steurer
a59de4a8e2 Fix not called lipo 2022-08-14 12:27:05 +02:00
Elias Steurer
b0705fe47a Fix osx lipo call 2022-08-14 12:24:02 +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
81944e7148 Add basic chocolatey support 2022-08-06 14:24:00 +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
962f3ea4cd Fix setup script 2022-07-22 13:35:23 +02:00
Elias Steurer
a8cad9eb76 Merge remote-tracking branch 'origin/master' 2022-07-22 13:35:08 +02:00
Elias Steurer
3a917c18c4 Update macos build scripts 2022-07-22 13:21:30 +02:00
Elias Steurer
cda5aeeb85 Add automatic requirements installation 2022-07-22 12:31:52 +02:00
Elias Steurer
4f27231311 Add python Windows ffmpeg downloads 2022-07-21 14:21:52 +02:00
Elias Steurer
e2e1a05347 Revert to bat file 
this works always, the ps1 script stopped working
for some reason....
 2022-07-15 13:11:09 +02:00
Elias Steurer
29ca12fc6e Merge remote-tracking branch 'origin/master' 2022-07-15 13:08:23 +02:00
Elias Steurer
37c8918683 Update to latest vcpkg and ffmpeg 5.0.1 
Remove old download_ffmpeg.bat
 2022-07-15 13:08:17 +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
82beeaeb05 Revert to Qt 6.3.1 
6.4 crashes on some videos
 2022-07-09 19:51: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
b900f5c0ae Add Scoop recipe 2022-05-20 13:23:39 +02:00
Elias Steurer
e00b5f1ebe Fix steam dylib paths 2022-05-12 14:55:58 +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
a366fcc56a Add .screenplay project export import via QArchive 2022-05-06 14:51:56 +02:00
Elias Steurer
40bfa967eb Fix build when only msvc2019 is installed 2022-04-24 09:56:50 +02:00
Elias Steurer
86aaa7147e Change sentry to be windows only for now 
this still has general problems with osx builds and m1 support
 2022-04-24 09:01:59 +02:00
Elias Steurer
5c138fa8d4 Update to latest vcpkg 
Add libxkbcommon for compiling shader
Fix SysInfo not available on osx and linux
 2022-04-23 20:15:32 +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
5d1c941cb3 Formatting 2022-04-04 18:09:45 +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
Elias Steurer
42bdd7682c Fix cmake formatting script ignoring sort 2022-03-12 14:36:03 +01:00
Elias Steurer
b44aab27ef Merge remote-tracking branch 'origin/master' into release 2022-02-20 17:57:08 +01:00
Elias Steurer
fb5d6581ec Change all plugins to be QML_ELEMENT 
Add ScreenPlayWeather
 2022-02-20 17:55:26 +01:00
Elias Steurer
907658261e Merge remote-tracking branch 'origin/release' 2022-02-17 18:13:41 +01:00
Elias Steurer
626904a6c1 Change linux deploy to just copy... 
everything from the qt installation
 2022-02-17 18:13:32 +01:00
Elias Steurer
13192e2964 Update Qt version in build.py 2022-02-03 18:45:12 +01:00
Elias Steurer
a1fe840e54 Fix IFW path on linux ci 2022-01-29 12:24:26 +01:00
Elias Steurer
e55182cdaf Add some basic working in installer with cmake 3.23 2022-01-27 14:54:45 +01:00
Elias Steurer
a2ac33180e Fix build.py help 2022-01-09 16:56:56 +01:00
darkelaina
14a64c9340 Refactor build script 2022-01-04 09:12:03 +00:00
Elias Steurer
0f5b310f68 Merge branch 'master' into qt6-kde 
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/src/screenplaymanager.cpp
#	Tools/build.py
 2021-12-31 13:32:37 +01:00
Elias Steurer
6bfdd9894c Fix steam plugin loading 2021-12-18 13:24:03 +01:00
Elias Steurer
4f5bfe44d1 Add cpack based installer 2021-12-04 10:41:21 +01:00
Elias Steurer
eabe625cd9 Add cpack IFW installer 
Update to Qt 6.2.2
 2021-12-03 15:30:17 +01:00
Elias Steurer
6bd7deaa43 Update vcpkg 
Fix compilation
Remove unused benchmark
 2021-12-02 15:31:05 +01:00
Elias Steurer
797b4e205c Fix qt version 2021-11-13 14:30:55 +01:00
Elias Steurer
2216fc3351 Fix macos qt path and version 2021-11-12 15:32:30 +01:00
Elias Steurer
8615d7371f Add basic http server 
this is for content like godot webasm
that is only able to be shown from a
webserver
 2021-10-23 18:34:25 +02:00
Elias Steurer
223d6225c2 Merge branch 'master' into qt6-support 
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/translations/ScreenPlay_pt_BR.ts
#	ScreenPlay/translations/ScreenPlay_zh_CN.ts
#	Tools/build.py
 2021-10-08 10:13:44 +02:00
Elias Steurer
d4289c8e08 Fix steam build default from true/false to on/off 2021-10-07 17:22:10 +02:00
Elias Steurer
4146f2fbba Fix missing dlls 2021-10-03 17:45:44 +02:00
Elias Steurer
6b653bdfdc Merge branch 'master' into qt6-support 
# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/qml/Workshop/Workshop.qml
#	ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
#	ScreenPlay/translations/ScreenPlay_.ts
#	ScreenPlay/translations/ScreenPlay_de.ts
#	ScreenPlay/translations/ScreenPlay_es.ts
#	ScreenPlay/translations/ScreenPlay_fr.ts
#	ScreenPlay/translations/ScreenPlay_ko.ts
#	ScreenPlay/translations/ScreenPlay_pt_br.ts
#	ScreenPlay/translations/ScreenPlay_ru.ts
#	ScreenPlay/translations/ScreenPlay_vi.qm
#	ScreenPlay/translations/ScreenPlay_vi.ts
#	ScreenPlay/translations/ScreenPlay_zh_cn.ts
 2021-09-26 17:56:40 +02:00
Elias Steurer
0b9bd9c02c Remove SCREENPLAY_STEAM_DEPLOY 
in the end it is the same as SCREENPLAY_STEAM
 2021-09-26 16:52:14 +02:00
Elias Steurer
6b3fc174d4 Fix qt version 2021-09-10 12:47:21 +02:00
Elias Steurer
7883a98181 Change apple signing to run parallel 2021-09-04 21:50:34 +02:00
Elias Steurer
dca107efbb Add examples to python scripts 2021-09-04 12:13:19 +02:00
Elias Steurer
30acb08bcf Fix macOS build.py 
It looks like these are the best settings to finally
create a working signation after many hours of experimenting
 2021-09-03 13:03:48 +02:00
Elias Steurer
3a49341083 Merge remote-tracking branch 'origin/master' 2021-08-21 14:11:21 +02:00
Elias Steurer
01f4b656de Replace branch name with commit text 
Branch name would always be master
 2021-08-21 14:11:16 +02:00
Elias Steurer
41f66a236a Fix incorrect qmldir for mac deploy 2021-08-21 14:09:19 +02:00
Elias Steurer
becba82a77 Fix depot name 2021-08-21 13:37:24 +02:00
Elias Steurer
0f4b30492b Fix missing depot in temporary folder 2021-08-21 13:28:32 +02:00
Elias Steurer
202cd32bb4 Add default vdf config names for every platform 
Makes sense to autodetect this.
 2021-08-21 13:17:08 +02:00
Elias Steurer
ddcb83b79b Add steam publish python script with dynamic description based on git branch, hash and date 2021-08-21 12:53:19 +02:00
Elias Steurer
5d1f1121dd Fix missing entitlements needed by mac version of steam 2021-08-16 15:58:45 +02:00
Elias Steurer
d76d782e72 Add missing ffmpeg prebuild bin to setup for mac 2021-08-16 11:48:06 +02:00
Elias Steurer
6ea784ffed Fix explicit steam workshop build for build.py 2021-08-16 11:22:25 +02:00
Elias Steurer
79e3c39721 Add steam depot config 2021-08-14 14:34:55 +02:00
Elias Steurer
28a9dd3ec6 Add explicit steam deploy version flag 
This simply disables the copy of the steam_appid.txt
 2021-08-14 12:59:43 +02:00
Elias Steurer
fe0ab29cf8 Change mac signing to be opt in 2021-08-14 12:44:32 +02:00
Elias Steurer
538889465d Merge remote-tracking branch 'origin/master' 2021-08-08 19:33:20 +02:00
Elias Steurer
2d04ce2608 Add macOS code signing 2021-08-08 19:31:50 +02:00
Elias Steurer
5752a56d14 Add missing benchmark dependency 2021-07-25 16:31:05 +02:00
Elias Steurer
f521f94a6a Disable infoware for now because it wont compile 2021-07-25 16:21:16 +02:00
Elias Steurer
613a4d435d Test CI 2021-07-25 16:15:31 +02:00
Elias Steurer
e3a6193275 Fix macos compilation and workshop files 2021-07-25 12:26:55 +02:00
Elias Steurer
2448e9462e Update vcpkg 2021-06-25 12:42:03 +02:00
Elias Steurer
2fb51d20e4 Add curl to satisfy sentry 2021-06-25 12:35:41 +02:00
Elias Steurer
60bf972c26 Fix vcpkg command call 2021-06-25 12:32:19 +02:00
Elias Steurer
e118fa235c Add sentry support for macos 
Fix cmake apple define because apple
is a unix system.
 2021-06-12 15:17:38 +02:00
Elias Steurer
5add9d869e Fix setup script for macos and linux 2021-06-12 14:42:55 +02:00
Elias Steurer
1e29d44d7d Add ffmpeg and fix video import 2021-05-21 12:02:16 +02:00
Elias Steurer
3fd25dcbeb Change formatter to 6.1 
6.1 actually now has support for some modern
qml features like inline components.
 2021-05-16 19:35:05 +02:00
Elias Steurer
4001d1ddd2 Fix join of arguments being to early 2021-05-16 16:38:04 +02:00
Elias Steurer
1bb3cd36b0 Fix arch 2021-05-16 16:34:05 +02:00