restructure project

theMackabu · Nov 28, 2023 · 8ae1590 · 8ae1590
1 parent c97fae0
commit 8ae1590
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,6 +28,7 @@ lazy_static = "1.4.0"
 prometheus = "0.13.3"
 serde_json = "1.0.108"
 simple-logging = "2.0.2"
+utoipa-rapidoc = "1.0.0"
 pretty_env_logger = "0.5.0"
 clap-verbosity-flag = "2.1.0"
 global_placeholders = "0.1.0"
@@ -36,6 +37,7 @@ psutil = { version = "3.2.2", features = ["serde"] }
 tabled = { version = "0.14.0", features = ["color"] }
 chrono = { version = "0.4.23", features = ["serde"] }
 serde = { version = "1.0.192", features = ["derive"] }
+utoipa = { version = "4.1.0", features = ["serde_yaml"] }
 
 [build-dependencies]
 chrono = "0.4.23"

diff --git a/Maidfile.toml b/Maidfile.toml
@@ -23,5 +23,5 @@ script = [
    "killall pmc",
    "maid build -q", 
    "sudo cp bin/pmc /usr/local/bin",
-    "echo Copied binary!"
+   "echo Copied binary!"
 ]
diff --git a/build.rs b/build.rs
@@ -28,12 +28,20 @@ fn main() {
 
     /* cc linking */
     cxx_build::bridge("src/lib.rs")
-        .file("src/cc/bridge.cc")
-        .file("src/cc/process.cc")
-        .file("src/cc/fork.cc")
+        .file("lib/bridge.cc")
+        .file("lib/process.cc")
+        .file("lib/fork.cc")
         .flag_if_supported("-std=c++17")
         .compile("bridge");
 
-    let watched = vec!["lib.rs", "cc/bridge.cc", "cc/process.cc", "cc/fork.cc", "include/bridge.h", "include/process.h", "include/fork.h"];
-    watched.iter().for_each(|file| println!("cargo:rerun-if-changed=src/{}", file));
+    let watched = vec![
+        "src/lib.rs",
+        "lib/bridge.cc",
+        "lib/process.cc",
+        "lib/fork.cc",
+        "lib/include/bridge.h",
+        "lib/include/process.h",
+        "lib/include/fork.h",
+    ];
+    watched.iter().for_each(|file| println!("cargo:rerun-if-changed={file}"));
 }
diff --git a/src/cc/bridge.cc → lib/bridge.cc b/src/cc/bridge.cc → lib/bridge.cc
@@ -1,5 +1,5 @@
-#include "../include/bridge.h"
-#include "../include/process.h"
+#include "include/bridge.h"
+#include "include/process.h"
 
 #include <iostream>
 #include <signal.h>

diff --git a/src/cc/fork.cc → lib/fork.cc b/src/cc/fork.cc → lib/fork.cc
@@ -1,4 +1,4 @@
-#include "../include/fork.h"
+#include "include/fork.h"
 #include <cstring>
 #include <stdexcept>
 #include <cstdlib>

diff --git a/src/include/bridge.h → lib/include/bridge.h b/src/include/bridge.h → lib/include/bridge.h
diff --git a/src/include/fork.h → lib/include/fork.h b/src/include/fork.h → lib/include/fork.h
diff --git a/src/include/process.h → lib/include/process.h b/src/include/process.h → lib/include/process.h
diff --git a/src/include/rust.h → lib/include/rust.h b/src/include/rust.h → lib/include/rust.h
diff --git a/src/cc/process.cc → lib/process.cc b/src/cc/process.cc → lib/process.cc
@@ -1,4 +1,4 @@
-#include "../include/process.h"
+#include "include/process.h"
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/wait.h>

diff --git a/src/lib.rs b/src/lib.rs
@@ -30,9 +30,9 @@ pub mod service {
     }
 
     unsafe extern "C++" {
-        include!("pmc/src/include/process.h");
-        include!("pmc/src/include/bridge.h");
-        include!("pmc/src/include/fork.h");
+        include!("pmc/lib/include/process.h");
+        include!("pmc/lib/include/bridge.h");
+        include!("pmc/lib/include/fork.h");
         type Callback = crate::Callback;
 
         pub fn stop(pid: i64) -> i64;