me0nline/LOGAR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix(packaging): package src module tree into standalone executables and fix ISPP syntax
Build and Push LOGAR Runner / Build & Push Runner Image (push) Canceled after 54s
Details
Release Binaries & Packages / Build & Release Standalone Binaries (Linux & Windows Cross-Compilation) (push) Canceled after 0s
Details
CI Test Suite / Run Component Tests & Pipeline Verification (push) Successful in 2m20s
Details

Browse Source
This commit is contained in:
me0nline
2026-10-04 00:28:59 +02:00
parent cd6b9baa8e
commit 9b80007a86
19 changed files with 120 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compilation/installer_client.iss
+1 -1
View File
@@ -1,4 +1,4 @@
#ifFileExists("version.iss")
#ifexist "version.iss"
#include "version.iss"
#endif
compilation/installer_server.iss
+1 -1
View File
@@ -1,4 +1,4 @@
#ifFileExists("version.iss")
#ifexist "version.iss"
#include "version.iss"
#endif
compilation/package_dist.py
+22 -6
View File
@@ -61,12 +61,16 @@ def write_checksum_file(filename, digest, binary_filename):
def build_pyinstaller_binary(script_path, binary_name):
print(f"[*] Compiling {binary_name} with PyInstaller (Bytecode optimized & stripped)...")
sep = ";" if platform.system() == "Windows" else ":"
cmd = [
sys.executable, "-m", "PyInstaller",
"--onefile",
"--clean",
"--strip",
"--optimize", "2",
"--paths", ROOT_DIR,
"--add-data", f"{SRC_DIR}{sep}src",
"--collect-all", "src",
"--distpath", DIST_DIR,
"--workpath", os.path.join(BUILD_TEMP, f"work_{binary_name}"),
"--specpath", os.path.join(BUILD_TEMP, f"spec_{binary_name}"),
@@ -84,10 +88,14 @@ def build_linux_zipapp_fallback():
print("[*] Packaging Linux standalone zipapp fallback binaries...")
# Linux Client zipapp
app_dir = os.path.join(BUILD_TEMP, "linux_app")
if os.path.exists(app_dir):
shutil.rmtree(app_dir)
os.makedirs(app_dir, exist_ok=True)
shutil.copytree(SRC_DIR, os.path.join(app_dir, "src"), ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
for f in os.listdir(SRC_DIR):
if f.endswith(".py"):
shutil.copy(os.path.join(SRC_DIR, f), os.path.join(app_dir, f))
src_f = os.path.join(SRC_DIR, f)
if os.path.isfile(src_f) and f.endswith(".py"):
shutil.copy(src_f, os.path.join(app_dir, f))
client_out = os.path.join(DIST_DIR, "Linux_Client.bin")
zipapp.create_archive(
source=app_dir,
@@ -97,10 +105,14 @@ def build_linux_zipapp_fallback():
)
# Server zipapp
srv_dir = os.path.join(BUILD_TEMP, "linux_srv")
if os.path.exists(srv_dir):
shutil.rmtree(srv_dir)
os.makedirs(srv_dir, exist_ok=True)
shutil.copytree(SRC_DIR, os.path.join(srv_dir, "src"), ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
for f in os.listdir(SRC_DIR):
if f.endswith(".py"):
shutil.copy(os.path.join(SRC_DIR, f), os.path.join(srv_dir, f))
src_f = os.path.join(SRC_DIR, f)
if os.path.isfile(src_f) and f.endswith(".py"):
shutil.copy(src_f, os.path.join(srv_dir, f))
server_out = os.path.join(DIST_DIR, "Server.bin")
zipapp.create_archive(
source=srv_dir,
@@ -197,11 +209,15 @@ def create_windows_exe_zipapp(script_name, exe_name):
the standard Python Windows 64-bit PE launcher stub (t64.exe) to a compiled zipapp archive.
"""
app_temp_dir = os.path.join(BUILD_TEMP, f"win_app_{exe_name}")
if os.path.exists(app_temp_dir):
shutil.rmtree(app_temp_dir)
os.makedirs(app_temp_dir, exist_ok=True)
shutil.copytree(SRC_DIR, os.path.join(app_temp_dir, "src"), ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
for f in os.listdir(SRC_DIR):
if f.endswith(".py"):
shutil.copy(os.path.join(SRC_DIR, f), os.path.join(app_temp_dir, f))
src_f = os.path.join(SRC_DIR, f)
if os.path.isfile(src_f) and f.endswith(".py"):
shutil.copy(src_f, os.path.join(app_temp_dir, f))
module_name = os.path.splitext(script_name)[0]
zipapp_temp = os.path.join(BUILD_TEMP, f"{exe_name}.zip")
src/Linux_Client.py
+6 -3
View File
@@ -1,9 +1,12 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.clients.Linux_Client import *
src/Server.py
+6 -3
View File
@@ -1,9 +1,12 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.Server import *
src/Win_Client.py
+6 -3
View File
@@ -1,9 +1,12 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.clients.Win_Client import *
src/auth_manager.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.auth_manager import *
src/client_transport.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.clients.client_transport import *
src/client_updater.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.clients.client_updater import *
src/ingest_queue.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.ingest_queue import *
src/license_manager.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.license_manager import *
src/log_collector.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.clients.log_collector import *
src/pki_manager.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.pki_manager import *
src/server_enrollment.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.server_enrollment import *
src/server_models.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.server_models import *
src/storage_engine.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.storage_engine import *
src/update_manager.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.update_manager import *
src/version.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.common.version import *
src/web_ui.py
+6 -3
View File
@@ -1,8 +1,11 @@
import os
import sys
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
if _ROOT not in sys.path:
sys.path.insert(0, _ROOT)
_CUR = os.path.dirname(__file__)
_ROOT = os.path.abspath(os.path.join(_CUR, ".."))
for _p in [_CUR, _ROOT]:
if _p and _p not in sys.path:
sys.path.insert(0, _p)
from src.hub.web_ui import *