[py] Fix OGS_BIN_DIR.

ufz · Aug 14, 2024 · 4e9d192 · 4e9d192
1 parent f561d24
commit 4e9d192
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Applications/Python/ogs/_internal/provide_ogs_cli_tools_via_wheel.py b/Applications/Python/ogs/_internal/provide_ogs_cli_tools_via_wheel.py
@@ -6,10 +6,6 @@
 
 from . import OGS_USE_PATH
 
-# Here, we assume that this script is installed, e.g., in a virtual environment
-# alongside a "bin" directory.
-OGS_BIN_DIR = Path(__file__).parent.parent.parent / "bin"
-
 binaries_list = [
     "addDataToRaster",
     "AddElementQuality",
@@ -112,6 +108,12 @@ def ogs_with_args(argv):
 
 
 if "PEP517_BUILD_BACKEND" not in os.environ:
+    # Here, we assume that this script is installed, e.g., in a virtual environment
+    # alongside a "bin" directory.
+    OGS_BIN_DIR = Path(__file__).parent.parent.parent / "bin"  # installed wheel
+    if not OGS_BIN_DIR.exists():
+        OGS_BIN_DIR = OGS_BIN_DIR.parent  # build directory
+
     if platform.system() == "Windows":
         os.add_dll_directory(OGS_BIN_DIR)
 

diff --git a/Applications/Python/ogs/_internal/wrap_cli_tools.py b/Applications/Python/ogs/_internal/wrap_cli_tools.py
@@ -6,7 +6,9 @@
 
 # Here, we assume that this script is installed, e.g., in a virtual environment
 # alongside a "bin" directory.
-OGS_BIN_DIR = Path(__file__).parent.parent.parent / "bin"
+OGS_BIN_DIR = Path(__file__).parent.parent.parent / "bin"  # installed wheel
+if not OGS_BIN_DIR.exists():
+    OGS_BIN_DIR = OGS_BIN_DIR.parent  # build directory
 
 
 class CLI: