braidz-mcsc: move to geometry/

strawlab · Jan 14, 2025 · 0020970 · 0020970
1 parent 26815f1
commit 0020970
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -675,7 +675,7 @@ slow-tests:
     - cd $CI_PROJECT_DIR/geometry/mcsc-structs
     - ./package-mcsc-zip.sh
 
-    - cd $CI_PROJECT_DIR/braidz-mcsc
+    - cd $CI_PROJECT_DIR/geometry/braidz-mcsc
     - cargo test --release -- --include-ignored
 
     - cd $CI_PROJECT_DIR/braid-process-video
@@ -702,9 +702,9 @@ extra-programs:
     - cd $CI_PROJECT_DIR/geometry/mcsc-structs
     - ./package-mcsc-zip.sh
 
-    - cd $CI_PROJECT_DIR/braidz-mcsc
+    - cd $CI_PROJECT_DIR/geometry/braidz-mcsc
     - cargo build --release
-    - cp ../target/release/braidz-mcsc $CI_PROJECT_DIR/build
+    - cp $CI_PROJECT_DIR/target/release/braidz-mcsc $CI_PROJECT_DIR/build
 
     - cd $CI_PROJECT_DIR/braidz-export-rrd
     - PKG_CONFIG_PATH=/opt/opencv-4.9.0-static/lib/pkgconfig OPENCV_STATIC=1 cargo build --release

diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,6 @@ members = [
     "braid-offline",
     "braid-process-video",
     "braidz-export-rrd",
-    "braidz-mcsc",
     "braidz-parser",
     "braidz-parser/braidz-chunked-iter",
     "braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter",
@@ -52,6 +51,7 @@ members = [
     "freemovr-calibration/freemovr-calibration-cli",
     "freemovr-calibration/freemovr-calibration-webapp",
     "freemovr-calibration/ncollide-geom",
+    "geometry/braidz-mcsc",
     "geometry/camcal",
     "geometry/flydra-mvg",
     "geometry/mcsc-structs",

diff --git a/braidz-mcsc/Cargo.toml → geometry/braidz-mcsc/Cargo.toml b/braidz-mcsc/Cargo.toml → geometry/braidz-mcsc/Cargo.toml
diff --git a/braidz-mcsc/src/main.rs → geometry/braidz-mcsc/src/main.rs b/braidz-mcsc/src/main.rs → geometry/braidz-mcsc/src/main.rs