finally working macOS build

This commit is contained in:
DJ2LS 2023-01-22 23:35:52 +01:00
parent 1b90d38ebf
commit f7bcdad47f
3 changed files with 10 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "FreeDATA", "name": "FreeDATA",
"version": "0.6.12-alpha.5", "version": "0.6.12-alpha.6",
"description": "FreeDATA ", "description": "FreeDATA ",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

View File

@ -60,17 +60,20 @@ def freedv_get_mode_name_by_value(mode: int) -> str:
# Check if we are running in a pyinstaller environment # Check if we are running in a pyinstaller environment
if hasattr(sys, "_MEIPASS"): #if hasattr(sys, "_MEIPASS"):
sys.path.append(getattr(sys, "_MEIPASS")) # sys.path.append(getattr(sys, "_MEIPASS"))
else: #else:
sys.path.append(os.path.abspath(".")) sys.path.append(os.path.abspath("."))
log.info("[C2 ] Searching for libcodec2...") log.info("[C2 ] Searching for libcodec2...")
if sys.platform == "linux": if sys.platform == "linux":
files = glob.glob(r"**/*libcodec2*", recursive=True) files = glob.glob(r"**/*libcodec2*", recursive=True)
files.append("libcodec2.so") files.append("libcodec2.so")
elif sys.platform == "darwin": elif sys.platform == "darwin":
files = glob.glob(r"**/*libcodec2*.dylib", recursive=True) if hasattr(sys, "_MEIPASS"):
files = glob.glob(getattr(sys, "_MEIPASS") + '/**/*libcodec2*', recursive=True)
else:
files = glob.glob(r"**/*libcodec2*.dylib", recursive=True)
elif sys.platform in ["win32", "win64"]: elif sys.platform in ["win32", "win64"]:
files = glob.glob(r"**\*libcodec2*.dll", recursive=True) files = glob.glob(r"**\*libcodec2*.dll", recursive=True)
else: else:

View File

@ -11,7 +11,7 @@ Not nice, suggestions are appreciated :-)
import subprocess import subprocess
from enum import Enum from enum import Enum
VERSION = "0.6.12-alpha.5" VERSION = "0.6.12-alpha.6"
ENABLE_EXPLORER = False ENABLE_EXPLORER = False