Revert "Revert if works"

This reverts commit f9da163.
luxonis · Dec 5, 2024 · 8db7d35 · 8db7d35
1 parent f9da163
commit 8db7d35
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 61 deletions.
diff --git a/rerun_py/Cargo.toml b/rerun_py/Cargo.toml
@@ -79,4 +79,9 @@ pyo3-build-config = "0.18.0"
 
 
 [package.metadata.maturin]
+# Metadata for maturin builds
 name = "depthai_viewer_bindings"
+include = [
+    "rerun_py/**",                       # Include all files in the Rust workspace
+    "depthai_viewer/_backend/obscured_utilities/utilities/pyarmor_runtime_007125/**" # Include platform-specific files
+]
diff --git a/rerun_py/build.rs b/rerun_py/build.rs
@@ -1,6 +1,35 @@
+use std::process::Command;
+use std::path::Path;
 fn main() {
     // Required for `cargo build` to work on mac: https://pyo3.rs/v0.14.2/building_and_distribution.html#macos
     pyo3_build_config::add_extension_module_link_args();
 
     re_build_build_info::export_env_vars();
+    let script_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("select_package.py");
+    if !script_path.exists() {
+        panic!("Pre-build script not found: {:?}", script_path);
+    }
+
+    println!("Running pre-build script...");
+
+    // Try `python` first
+    let python_result = Command::new("python3")
+        .arg(&script_path)
+        .status();
+
+    // If `python` fails, fall back to `python3`
+    let status = match python_result {
+        Ok(status) if status.success() => status,
+        _ => Command::new("python")
+            .arg(&script_path)
+            .status()
+            .expect("Failed to execute pre-build script with both `python` and `python3`"),
+    };
+
+    if !status.success() {
+        panic!("Pre-build script failed with status: {:?}", status);
+    }
+
+    println!("Pre-build script completed successfully.");
+    println!("cargo:rerun-if-changed=select_package.py");
 }
diff --git a/rerun_py/depthai_viewer/_backend/obscured_utilities/__init__.py b/rerun_py/depthai_viewer/_backend/obscured_utilities/__init__.py
diff --git a/rerun_py/depthai_viewer/_backend/obscured_utilities/utilities/__init__.py b/rerun_py/depthai_viewer/_backend/obscured_utilities/utilities/__init__.py
diff --git a/rerun_py/depthai_viewer/_backend/obscured_utilities/utilities/calibration_handler.py b/rerun_py/depthai_viewer/_backend/obscured_utilities/utilities/calibration_handler.py
diff --git a/rerun_py/depthai_viewer/_backend/obscured_utilities/utilities/display_handler.py b/rerun_py/depthai_viewer/_backend/obscured_utilities/utilities/display_handler.py
diff --git a/...y/depthai_viewer/_backend/obscured_utilities/utilities/pyarmor_runtime_007125/__init__.py b/...y/depthai_viewer/_backend/obscured_utilities/utilities/pyarmor_runtime_007125/__init__.py
diff --git a/...kend/obscured_utilities/utilities/pyarmor_runtime_007125/darwin_x86_64/pyarmor_runtime.so b/...kend/obscured_utilities/utilities/pyarmor_runtime_007125/darwin_x86_64/pyarmor_runtime.so
diff --git a/...ckend/obscured_utilities/utilities/pyarmor_runtime_007125/linux_x86_64/pyarmor_runtime.so b/...ckend/obscured_utilities/utilities/pyarmor_runtime_007125/linux_x86_64/pyarmor_runtime.so
diff --git a/...nd/obscured_utilities/utilities/pyarmor_runtime_007125/windows_x86_64/pyarmor_runtime.pyd b/...nd/obscured_utilities/utilities/pyarmor_runtime_007125/windows_x86_64/pyarmor_runtime.pyd
diff --git a/rerun_py/pyproject.toml b/rerun_py/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "maturin"
-requires = ["maturin>=0.14.0,<0.15","setuptools", "wheel"]
+requires = ["maturin>=0.14.0,<0.15"]
 
 [project]
 dependencies = ["deprecated", "numpy>=1.23", "pyarrow==16.0.0", "setuptools"]
@@ -90,3 +90,5 @@ ban-relative-imports = "all"
 locked = true
 python-packages = ["depthai_viewer"]
 
+[tool.maturin.scripts]
+pre-build = "python select_package.py"