Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
shinrax2 committed Feb 12, 2021
1 parent eeccd1a commit a23029f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
- bugfix

future release (aka current master branch):

v009:
+ update turkish translation
+ use UPX for builds to produce smaller binaries and hopefully slightly less antivirus false positives
+ added an icon to the executable and the windows
- fix cut off header in build.log
- removed hotfix for issues between keyring and PyInstaller
- fix crash when downloading updates
- fix finding updates on modern linux

v008:
! refactored gui code
Expand Down
16 changes: 9 additions & 7 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@

def buildheader(version, commitid , filepath , pyiver="None"):
lines = [ "Building PS3GameUpdateDownloader",
"Build script arguments: "+str(sys.argv),
"Build script arguments: "+str(sys.argv[1:]),
"Version: "+version,
"Git Commit: "+commitid,
"Python version: "+sys.version
]
if pyiver != "None":
lines.append("PyInstaller version: "+pyiver)
lines.append("Platform: "+platform.system()+" "+platform.architecture()[0])
lines.append("")
lines.append("PyInstaller Output:")
lines.append("")
Expand Down Expand Up @@ -124,7 +125,7 @@ def __exit__(self, type, value, traceback):

#check parameters
action = ""
zip = False
zip_check = False
upx_check = False
if args.c == True and args.s == True:
print("You cant pass \"-c\" and \"-s\" to the buildscript.")
Expand All @@ -148,7 +149,7 @@ def __exit__(self, type, value, traceback):
upx_check = True
upx_paths = Upx()
if args.z == True:
zip = True
zip_check = True
zipname = "dist/PS3GameUpdateDownloader-"+version
if args.nogit == True:
gitver = "None"
Expand Down Expand Up @@ -183,7 +184,7 @@ def __exit__(self, type, value, traceback):
shutil.copytree("./loc", os.path.join(builddir, "loc"))
shutil.copytree("./logos", os.path.join(builddir, "logos"))
#build zip
if zip == True:
if zip_check == True:
shutil.make_archive(zipname+"-source", "zip", "dist", os.path.relpath(builddir, "dist"))

if action == "sourcedebug":
Expand Down Expand Up @@ -214,7 +215,7 @@ def __exit__(self, type, value, traceback):
shutil.copytree("./loc", os.path.join(builddir, "loc"))
shutil.copytree("./logos", os.path.join(builddir, "logos"))
#build zip
if zip == True:
if zipzip_check == True:
shutil.make_archive(zipname+"-source-debug", "zip", "dist", os.path.relpath(builddir, "dist"))

if action == "compilerelease":
Expand Down Expand Up @@ -273,7 +274,7 @@ def __exit__(self, type, value, traceback):
#write header to buildlog
buildheader(version, gitver, buildlog, pyiver=PyInstaller.__init__.__version__)
#build zip
if zip == True:
if zip_check == True:
shutil.make_archive(zipname+"-"+arch, "zip", "dist", os.path.relpath(builddir, "dist"))

if action == "compiledebug":
Expand All @@ -300,6 +301,7 @@ def __exit__(self, type, value, traceback):
"--clean",
"--onefile",
"--windowed",
"--icon="+iconpath
]
if upx_check == True:
arg_main.append("--upx-dir="+upx_paths.get_upx_dir())
Expand Down Expand Up @@ -334,5 +336,5 @@ def __exit__(self, type, value, traceback):
#write header to buildlog
buildheader(version, gitver, buildlog, pyiver=PyInstaller.__init__.__version__)
#build zip
if zip == True:
if zip_check == True:
shutil.make_archive(zipname+"-"+arch+"-debug", "zip", "dist", os.path.relpath(builddir, "dist"))
7 changes: 5 additions & 2 deletions gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def __init__(self):
self.updateChecked = False
self.proxydisabled = False
self.noKeyrings = False
self.keyring_support_shown = False
if platform.system() == "Windows":
self.iconpath = os.path.abspath(os.path.join("logos", "icon.ico"))
else:
Expand Down Expand Up @@ -105,8 +106,10 @@ def mainWin(self):
#main loop
while True:
if self.noKeyrings == True:
if self.ps3.getConfig("dont_show_again_keyring_support") == False:
self.keyring_supportWin()
if self.keyring_support_shown == False:
if self.ps3.getConfig("dont_show_again_keyring_support") == False:
self.keyring_supportWin()
self.keyring_support_shown = True
if self.ps3.useDefaultConfig == True:
self.configWin(nocancel=True)
if self.ps3.getConfig("checkForNewRelease"):
Expand Down
2 changes: 1 addition & 1 deletion release.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "v008",
"version": "v009",
"author": "shinrax2",
"repo": "PS3GameUpdateDownloader"
}

0 comments on commit a23029f

Please sign in to comment.