DEBUG: instead of onefile now one dir for debugging purpose.

HenkVanHoek · HenkVanHoek · commit 7dd3b0f1f573 · 2025-08-19T13:14:49.000+02:00
diff --git a/clone-vm.spec b/clone-vm.spec
@@ -1,14 +1,13 @@
-# clone-vm.spec (Final, Definitive Version)
+# clone-vm.spec (Directory Build Test)
 # -*- mode: python ; coding: utf-8 -*-
 
 from PyInstaller.utils.hooks import collect_dynamic_libs
-import sys
 
 block_cipher = None
 
 a = Analysis(
     ['run_clone.py'],
-    binaries=[],
+    binaries=collect_dynamic_libs('python'),
     datas=[],
     hiddenimports=[]
 )
@@ -19,9 +18,21 @@ exe = EXE(
     pyz,
     a.scripts,
     [],
+    exclude_binaries=True, # Exclude from EXE, will be in COLLECT
     name='clone-vm',
     console=True,
     upx=True,
-    version='file_version_info.txt',
-    onefile=True,
+    version='file_version_info.txt'
+)
+
+# The COLLECT object creates the final output directory
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='clone-vm'
 )
diff --git a/create-master-vm.spec b/create-master-vm.spec
@@ -1,15 +1,13 @@
-# create-master-vm.spec (Final, Definitive Version)
+# create-master-vm.spec (Directory Build Test)
 # -*- mode: python ; coding: utf-8 -*-
-import sys
+
 from PyInstaller.utils.hooks import collect_dynamic_libs
 
 block_cipher = None
 
-binaries = []
-
 a = Analysis(
     ['run_create_master.py'],
-    binaries=[],
+    binaries=collect_dynamic_libs('python'),
     datas=[],
     hiddenimports=[]
 )
@@ -20,9 +18,21 @@ exe = EXE(
     pyz,
     a.scripts,
     [],
+    exclude_binaries=True, # Exclude from EXE, will be in COLLECT
     name='create-master-vm',
     console=True,
     upx=True,
-    version='file_version_info.txt',
-    onefile=True
+    version='file_version_info.txt'
+)
+
+# The COLLECT object creates the final output directory
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='create-master-vm'
 )
diff --git a/web-app.spec b/web-app.spec
@@ -1,16 +1,15 @@
-# web-app.spec (Final, Definitive Version)
+# web-app.spec (Directory Build Test)
 # -*- mode: python ; coding: utf-8 -*-
 
 from PyInstaller.utils.hooks import collect_dynamic_libs
-import sys
 
 block_cipher = None
-binaries = []
 
 a = Analysis(
     ['webapp/app.py'],
-    binaries=binaries,
-    # Ensure these paths are correct for your project structure
+    binaries=collect_dynamic_libs('python'),
+    # This ensures your web templates and static files are included.
+    # Please verify these paths match your project structure.
     datas=[('webapp/templates', 'templates'), ('webapp/static', 'static')],
     hiddenimports=['waitress']
 )
@@ -21,10 +20,23 @@ exe = EXE(
     pyz,
     a.scripts,
     [],
+    # This is a best practice for directory builds to avoid duplicating DLLs.
+    exclude_binaries=True,
     name='pi-selfhosting-web',
-    # This should be False for a web/GUI application to hide the console
     console=False,
     upx=True,
-    version='file_version_info.txt',
-    onefile=True
+    version='file_version_info.txt'
+)
+
+# The COLLECT object is what tells PyInstaller to create a final output directory
+# instead of a single file.
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='pi-selfhosting-web'
 )
