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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	Tools/build_and_publish.py
This commit is contained in:
Elias Steurer 2022-11-02 16:41:55 +01:00
commit 33592b5f0d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/build_and_publish.py
View File

@ -18,6 +18,7 @@ stdout.reconfigure(encoding='utf-8')
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")
@ -110,6 +111,10 @@ if __name__ == "__main__":
build_config.create_installer = "OFF" build_config.create_installer = "OFF"
build_result = build.execute(build_config) build_result = build.execute(build_config)
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(

2
Tools/macos_lipo.py
View File

@ -31,7 +31,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: