diff --git a/icon.ico b/icon.ico index 797410ab..a142b56b 100644 Binary files a/icon.ico and b/icon.ico differ diff --git a/setup.py b/setup.py index 80ad9064..48872d7b 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ buildfolder = Path("build", folder) sbuildfolder = str(buildfolder) libfolder = Path(buildfolder, "lib") library = Path(libfolder, "library.zip") -print("Outputting to: " + str(buildfolder)) -compress = False -icon="icon.ico" +print("Outputting to: " + sbuildfolder) + +icon = "icon.ico" if os.path.exists("X:/pw.txt"): print("Using signtool") @@ -28,13 +28,16 @@ else: from hashlib import sha3_512 import base64 + def _threaded_hash(filepath): hasher = sha3_512() hasher.update(open(filepath, "rb").read()) return base64.b85encode(hasher.digest()).decode() + os.makedirs(buildfolder, exist_ok=True) + def manifest_creation(): hashes = {} manifestpath = os.path.join(buildfolder, "manifest.json") @@ -51,11 +54,11 @@ def manifest_creation(): print("Created Manifest") -scripts = {"MultiClient.py" : "BerserkerMultiClient", - "MultiMystery.py" : "BerserkerMultiMystery", - "MultiServer.py" : "BerserkerMultiServer", - "gui.py" : "BerserkerMultiCreator", - "Mystery.py" : "BerserkerMystery"} +scripts = {"MultiClient.py": "BerserkerMultiClient", + "MultiMystery.py": "BerserkerMultiMystery", + "MultiServer.py": "BerserkerMultiServer", + "gui.py": "BerserkerMultiCreator", + "Mystery.py": "BerserkerMystery"} exes = [] @@ -66,7 +69,6 @@ for script, scriptname in scripts.items(): icon=icon, )) - import datetime buildtime = datetime.datetime.utcnow() @@ -137,5 +139,4 @@ if signtool: print(f"Signing {exe.targetName}") os.system(signtool + exe.targetName) - manifest_creation()