Move bins to simplify pyinstaller paths

X9X0 · Oct 23, 2023 · 55cd19f · 55cd19f
1 parent bb47bd5
commit 55cd19f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/software/pyinstaller.spec b/software/pyinstaller.spec
@@ -8,7 +8,7 @@ a = Analysis(
     ['script/chameleon_cli_main.py'],
     pathex=[],
     binaries=[
-        ("bin/*", "bin/"),
+        ("script/bin/*", "bin/"),
     ],
     datas=[],
     hiddenimports=[],

diff --git a/software/script/chameleon_cli_unit.py b/software/script/chameleon_cli_unit.py
@@ -36,12 +36,7 @@
                     0x38: "SmartMX with MIFARE Classic 4K",
                     }
 
-if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
-    # in pyinstaller
-    default_cwd = Path.cwd() / Path(sys._MEIPASS) / "bin"
-else:
-    # from source
-    default_cwd = Path.cwd() / Path(__file__).parent.parent / "bin"
+default_cwd = Path.cwd() / Path(__file__).with_name("bin")
 
 
 def check_tools():

diff --git a/software/src/CMakeLists.txt b/software/src/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.1)
 
 project (mifare C)
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../bin)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../script/bin)
 set(SRC_DIR ./)
 
 set(COMMON_FILES