From d7282082f46df45a1a7719c4230e7e19769abaf1 Mon Sep 17 00:00:00 2001
From: Vitali Graf <info@vitaligraf.de>
Date: Sat, 28 Mar 2026 19:32:03 +0100
Subject: [PATCH] Fix: Version und Drittanbieter-Lizenzen im PyInstaller-Build
 anzeigen (v1.2.6)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pyproject.toml und THIRD_PARTY_LICENSES.txt werden nun ins PyInstaller-Bundle
eingebunden. Pfadauflösung nutzt sys._MEIPASS im Bundle-Kontext.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 DocuMentor.spec          | 83 +++++++++++++++++++++-------------------
 DocuMentor.wxs           |  2 +-
 THIRD_PARTY_LICENSES.txt |  2 +-
 installer.iss            |  2 +-
 pyproject.toml           |  2 +-
 src/license_parser.py    |  9 ++++-
 src/ui/AboutDialog.py    |  7 +++-
 7 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/DocuMentor.spec b/DocuMentor.spec
index 1aad251..71ad47e 100644
--- a/DocuMentor.spec
+++ b/DocuMentor.spec
@@ -4,46 +4,49 @@ PyInstaller Konfiguration für DocuMentor
 Erstellt eine eigenständige Windows-Executable ohne Python-Installation
 """
 
-import sys
-from pathlib import Path
-from PyInstaller.utils.hooks import collect_all
-
-block_cipher = None
-
-# Projektpfad
-project_root = Path(SPECPATH)
-src_path = project_root / 'src'
-
-# connectorx komplett sammeln (Python-Code, native .pyd und Metadaten)
-# PyInstaller erkennt connectorx nicht automatisch, da es zur Laufzeit
-# von polars per importlib.import_module() geladen wird
-cx_datas, cx_binaries, cx_hiddenimports = collect_all('connectorx')
-
-# Alle UI-Dateien sammeln
-ui_files = []
-for ui_file in (src_path / 'ui').glob('*.ui'):
-    ui_files.append((str(ui_file), 'ui'))
-
-# Ressource-Dateien (SQL, CSV) einbinden
-res_files = []
-for res_file in (src_path / 'res').glob('*'):
-    res_files.append((str(res_file), 'res'))
-
-a = Analysis(
-    [str(src_path / 'main.py')],
-    pathex=[str(src_path)],
-    binaries=cx_binaries,
-    datas=ui_files + res_files + cx_datas,
-    hiddenimports=[
-        'PySide6.QtCore',
-        'PySide6.QtGui',
-        'PySide6.QtWidgets',
-        'pydantic',
-        'pydantic_settings',
-        'pydantic_yaml',
-        'polars',
-        'pyarrow',
-    ] + cx_hiddenimports,
+import sys
+from pathlib import Path
+from PyInstaller.utils.hooks import collect_all
+
+block_cipher = None
+
+# Projektpfad
+project_root = Path(SPECPATH)
+src_path = project_root / 'src'
+
+# connectorx komplett sammeln (Python-Code, native .pyd und Metadaten)
+# PyInstaller erkennt connectorx nicht automatisch, da es zur Laufzeit
+# von polars per importlib.import_module() geladen wird
+cx_datas, cx_binaries, cx_hiddenimports = collect_all('connectorx')
+
+# Alle UI-Dateien sammeln
+ui_files = []
+for ui_file in (src_path / 'ui').glob('*.ui'):
+    ui_files.append((str(ui_file), 'ui'))
+
+# Ressource-Dateien (SQL, CSV) einbinden
+res_files = []
+for res_file in (src_path / 'res').glob('*'):
+    res_files.append((str(res_file), 'res'))
+
+a = Analysis(
+    [str(src_path / 'main.py')],
+    pathex=[str(src_path)],
+    binaries=cx_binaries,
+    datas=ui_files + res_files + cx_datas + [
+        (str(project_root / 'pyproject.toml'), '.'),
+        (str(project_root / 'THIRD_PARTY_LICENSES.txt'), '.'),
+    ],
+    hiddenimports=[
+        'PySide6.QtCore',
+        'PySide6.QtGui',
+        'PySide6.QtWidgets',
+        'pydantic',
+        'pydantic_settings',
+        'pydantic_yaml',
+        'polars',
+        'pyarrow',
+    ] + cx_hiddenimports,
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
diff --git a/DocuMentor.wxs b/DocuMentor.wxs
index 042c83d..690de9d 100644
--- a/DocuMentor.wxs
+++ b/DocuMentor.wxs
@@ -4,7 +4,7 @@
   <!-- Paket-Definition (ersetzt Product in v4) -->
   <Package 
     Name="DocuMentor" 
-    Version="1.2.5"
+    Version="1.2.6"
     Manufacturer="Vitali Graf / Software- und Datenbankentwicklung" 
     UpgradeCode="F498B66C-726D-44AA-95F4-CB4FBDCEF26E"
     Language="1031"
diff --git a/THIRD_PARTY_LICENSES.txt b/THIRD_PARTY_LICENSES.txt
index 5c0e776..160de66 100644
--- a/THIRD_PARTY_LICENSES.txt
+++ b/THIRD_PARTY_LICENSES.txt
@@ -253,5 +253,5 @@ HINWEISE
 
 ================================================================================
 Stand: März 2026
-Erstellt für: DocuMentor v1.2.5
+Erstellt für: DocuMentor v1.2.6
 ================================================================================
diff --git a/installer.iss b/installer.iss
index a6fb8fb..071763a 100644
--- a/installer.iss
+++ b/installer.iss
@@ -10,7 +10,7 @@
 ; Build-Befehl: iscc installer.iss
 
 #define MyAppName "DocuMentor"
-#define MyAppVersion "1.2.5"
+#define MyAppVersion "1.2.6"
 #define MyAppPublisher "Ihr Name/Organisation"
 #define MyAppURL "https://github.com/yourusername/xsl-validator"
 #define MyAppExeName "DocuMentor.exe"
diff --git a/pyproject.toml b/pyproject.toml
index 4332646..7d7464b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "DocuMentor"
-version = "1.2.5"
+version = "1.2.6"
 description = "Professionelle XSL-Transformations-Verwaltung und PDF-Generierung"
 readme = "README.md"
 license = {text = "MIT"}
diff --git a/src/license_parser.py b/src/license_parser.py
index 6008a65..bd82703 100644
--- a/src/license_parser.py
+++ b/src/license_parser.py
@@ -6,14 +6,19 @@ mit den tatsächlich installierten Paketversionen via importlib.metadata.
 """
 import logging
 import re
+import sys
 from dataclasses import dataclass, field
 from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
 
 logger = logging.getLogger(__name__)
 
-# Pfad zur Lizenzdatei relativ zum Projektroot
-LICENSE_FILE = Path(__file__).parent.parent / "THIRD_PARTY_LICENSES.txt"
+# Pfad zur Lizenzdatei: im PyInstaller-Bundle aus sys._MEIPASS,
+# im Entwicklungsmodus relativ zum Projektroot
+if hasattr(sys, "_MEIPASS"):
+    LICENSE_FILE = Path(sys._MEIPASS) / "THIRD_PARTY_LICENSES.txt"  # type: ignore[attr-defined]
+else:
+    LICENSE_FILE = Path(__file__).parent.parent / "THIRD_PARTY_LICENSES.txt"
 
 # Mapping von Anzeigenamen zu PyPI-Paketnamen für Sonderfälle
 _PACKAGE_NAME_MAP: dict[str, str] = {
diff --git a/src/ui/AboutDialog.py b/src/ui/AboutDialog.py
index 56fa5b4..d488068 100644
--- a/src/ui/AboutDialog.py
+++ b/src/ui/AboutDialog.py
@@ -45,11 +45,14 @@ class AboutDialog(QDialog):
         try:
             return version("DocuMentor")
         except PackageNotFoundError:
-            # Fallback: pyproject.toml parsen (Entwicklungsmodus ohne Installation)
+            # Fallback: pyproject.toml parsen (PyInstaller-Bundle oder Entwicklungsmodus)
             try:
                 import tomllib
 
-                pyproject = Path(__file__).parent.parent.parent / "pyproject.toml"
+                if hasattr(sys, "_MEIPASS"):
+                    pyproject = Path(sys._MEIPASS) / "pyproject.toml"  # type: ignore[attr-defined]
+                else:
+                    pyproject = Path(__file__).parent.parent.parent / "pyproject.toml"
                 with open(pyproject, "rb") as f:
                     return tomllib.load(f)["project"]["version"]
             except Exception: