WIP

Signed-off-by: Andrew Stein <[email protected]>
finos · Oct 14, 2024 · 871beb5 · 871beb5
1 parent b658eec
commit 871beb5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust/generate-metadata/Cargo.toml b/rust/generate-metadata/Cargo.toml
@@ -25,6 +25,10 @@ bench = false
 version = "10.0.0"
 features = ["serde-json-impl", "no-serde-warnings"]
 
+[dependencies.perspective-server]
+path = "../perspective-server"
+features = ["external-cpp", "disable-cpp"]
+
 [dependencies.perspective-client]
 path = "../perspective-client"
 features = ["external-proto", "omit_metadata"]

diff --git a/rust/perspective-js/build.js b/rust/perspective-js/build.js
@@ -71,7 +71,7 @@ function get_host() {
 function build_rust() {
     const release_flag = IS_DEBUG ? "" : "--release";
     execSync(
-        `PSP_ROOT_DIR=../.. cargo bundle --target=${get_host()} -- perspective_js ${release_flag} --features=export-init,external-cpp`,
+        `PSP_ROOT_DIR=../.. cargo bundle --target=${get_host()} -- perspective_js ${release_flag} --features=export-init`,
         INHERIT
     );
 }

diff --git a/rust/perspective-python/build.mjs b/rust/perspective-python/build.mjs
@@ -87,7 +87,7 @@ if (build_wheel) {
         flags += " -vv";
     }
 
-    cmd.sh(`maturin build ${flags} --features=external-cpp ${target}`);
+    cmd.sh(`maturin build ${flags} ${target}`);
 }
 
 const old = fs.readFileSync("./pyproject.toml");

diff --git a/rust/perspective-server/Cargo.toml b/rust/perspective-server/Cargo.toml
@@ -36,8 +36,7 @@ default = ["python"]
 external-cpp = []
 wasm-exceptions = []
 python = []
-export-cpp-only = []
-no-build-cpp = []
+disable-cpp = []
 
 [build-dependencies]
 cmake = "0.1.50"

diff --git a/rust/perspective-server/build/main.rs b/rust/perspective-server/build/main.rs
@@ -35,7 +35,9 @@ fn main() -> Result<(), std::io::Error> {
         return Ok(());
     }
 
-    if std::option_env!("PSP_DISABLE_CPP").is_none() {
+    if std::option_env!("PSP_DISABLE_CPP").is_none()
+        && std::option_env!("CARGO_FEATURE_DISABLE_CPP").is_none()
+    {
         if let Some(artifact_dir) = psp::cmake_build()? {
             psp::cmake_link_deps(&artifact_dir)?;
         }