Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity

Add skip publish step

Browse Source 
Change osx base to x64. This no longer crashes the
app and x64 and it still works for arm...
This commit is contained in:
Elias Steurer 2022-11-02 16:39:23 +01:00
parent 4ad3b14c31
commit 85aad49a29
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/build_and_publish.py
View File

@ -14,6 +14,7 @@ from util import sftp_exists
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Build and Package ScreenPlay') parser = argparse.ArgumentParser(description='Build and Package ScreenPlay')
parser.add_argument('-skip_publish', '-skp', action="store_true", dest="skip_publish", help="Steam password")
parser.add_argument('-steam_password', '-sp', action="store", dest="steam_password", help="Steam password") parser.add_argument('-steam_password', '-sp', action="store", dest="steam_password", help="Steam password")
parser.add_argument('-hosting_username','-hu', action="store", dest="hosting_username", help="ssh username") parser.add_argument('-hosting_username','-hu', action="store", dest="hosting_username", help="ssh username")
parser.add_argument('-hosting_password', '-hp', action="store", dest="hosting_password", help="ssh password") parser.add_argument('-hosting_password', '-hp', action="store", dest="hosting_password", help="ssh password")
@ -97,6 +98,9 @@ if __name__ == "__main__":
sftp.close() sftp.close()
ssh.close() ssh.close()
if args.skip_publish:
print("Skip publishing.")
sys.exit(0)
# Make sure to reset to tools path # Make sure to reset to tools path
os.chdir(tools_path) os.chdir(tools_path)
steam_publish.publish( steam_publish.publish(

5
Tools/macos_lipo.py
View File

@ -1,11 +1,8 @@
#!/usr/bin/python3 #!/usr/bin/python3
from distutils.dir_util import mkpath from distutils.dir_util import mkpath
import os import os
import shutil
import pathlib
from pathlib import Path from pathlib import Path
from util import run, run_and_capture_output, cd_repo_root_path from util import run, run_and_capture_output, cd_repo_root_path
import warnings
def listfiles(path): def listfiles(path):
files = [] files = []
@ -31,7 +28,7 @@ def run_lipo() :
# Looks like it is ok the contain symlinks otherwise we get these errors for qml plugins: # Looks like it is ok the contain symlinks otherwise we get these errors for qml plugins:
# bundle format is ambiguous (could be app or framework) # bundle format is ambiguous (could be app or framework)
# https://bugreports.qt.io/browse/QTBUG-101338 # https://bugreports.qt.io/browse/QTBUG-101338
run("cp -a build-arm64-osx-release build-universal-osx-release",root_path) run("cp -a build-x64-osx-release build-universal-osx-release",root_path)
apps = ["ScreenPlay","ScreenPlayWallpaper", "ScreenPlayWidget"] apps = ["ScreenPlay","ScreenPlayWallpaper", "ScreenPlayWidget"]
for app in apps: for app in apps: