diff --git a/build-tools/dmgbuild.conf b/build-tools/dmgbuild.conf index c4c4bc6..d1ed7ff 100644 --- a/build-tools/dmgbuild.conf +++ b/build-tools/dmgbuild.conf @@ -1,16 +1,11 @@ import pathlib -import platform -from comictaggerlib.ctversion import __version__ app = "ComicTagger" -exe = app.casefold() -ver = platform.mac_ver() -os_version = f"osx-{ver[0]}-{ver[2]}" app_name = f"{app}.app" -final_name = f"{app}-{__version__}-{os_version}" -path = pathlib.Path(f"dist/{app_name}") -zip_file = pathlib.Path(f"dist/{final_name}.zip") +path = f"dist/{app_name}" + +# dmgbuild settings format = 'ULMO' files = (str(path),) diff --git a/build-tools/zip_artifacts.py b/build-tools/zip_artifacts.py index b426d30..5fe2dd1 100644 --- a/build-tools/zip_artifacts.py +++ b/build-tools/zip_artifacts.py @@ -71,7 +71,7 @@ if __name__ == "__main__": path = pathlib.Path(f"dist/{app_name}") binary_path = pathlib.Path("dist/binary") binary_path.mkdir(parents=True, exist_ok=True) - zip_file = binary_path / final_name + archive_destination = binary_path / final_name if platform.system() == "Darwin": from dmgbuild.__main__ import main as dmg_main @@ -81,10 +81,10 @@ if __name__ == "__main__": "-s", str(pathlib.Path(__file__).parent / "dmgbuild.conf"), f"{app} {__version__}", - f"{binary_path}.dmg", + f"{archive_destination}.dmg", ] dmg_main() elif platform.system() == "Windows": - Zip(zip_file, path) + Zip(archive_destination, path) else: - Tar(zip_file, path) + Tar(archive_destination, path)