From de0a82e10b0545d6135c4242c4c8d1281e60b2a6 Mon Sep 17 00:00:00 2001 From: Svein Seldal Date: Thu, 12 Sep 2024 16:54:46 +0200 Subject: [PATCH] Fix issue with missing files from executable (#46) * Bump version to 3.5.2 --- packaging/objdictedit.spec | 4 +++- src/objdictgen/__init__.py | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packaging/objdictedit.spec b/packaging/objdictedit.spec index c09e3d5..727e567 100644 --- a/packaging/objdictedit.spec +++ b/packaging/objdictedit.spec @@ -27,7 +27,9 @@ a = Analysis( pathex=[], binaries=[], datas=[ - (basepath + "/src/objdictgen/img/networkedit.ico", "objdictgen/img"), + (basepath + "/src/objdictgen/img/*", "objdictgen/img"), + (basepath + "/src/objdictgen/config/*.prf", "objdictgen/config"), + (basepath + "/src/objdictgen/schema/*.json", "objdictgen/schema"), ], hiddenimports=[], hookspath=[], diff --git a/src/objdictgen/__init__.py b/src/objdictgen/__init__.py index e2b1f34..b391d32 100644 --- a/src/objdictgen/__init__.py +++ b/src/objdictgen/__init__.py @@ -18,13 +18,14 @@ # USA import os +import sys from pathlib import Path from objdictgen.node import Node from objdictgen.nodemanager import NodeManager -__version__ = "3.5.1" -__version_tuple__ = (3, 5, 1, 0) +__version__ = "3.5.2" +__version_tuple__ = (3, 5, 2, 0) __copyright__ = "(c) 2024 Svein Seldal, Laerdal Medical AS, and several. Licensed under GPLv2.1." # Shortcuts @@ -33,7 +34,10 @@ ODG_PROGRAM = "odg" -SCRIPT_DIRECTORY = Path(__file__).parent +if hasattr(sys, '_MEIPASS'): + SCRIPT_DIRECTORY = Path(sys._MEIPASS) / 'objdictgen' +else: + SCRIPT_DIRECTORY = Path(__file__).resolve().parent PROFILE_DIRECTORIES: list[Path] = [ SCRIPT_DIRECTORY / 'config'