scx_rustland_core: separate crate source code from assets

scx_rustland_core needs to ship both a binary part and a source code part, which will be used to build schedulers based on it. To effectively publish the scx_rustland_core crate on crates.io we need to properly separate the source code assets from the crate's main source code. To achieve this, move the assets into a separate directory and declare them inside a [lib] section in Cargo.toml. This allows to publish the crate on crates.io, providing also a clear separation between source code and assets. Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
takase1121 · Apr 4, 2024 · 85a32a7 · 85a32a7
1 parent 163e96d
commit 85a32a7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/rust/scx_rustland_core/Cargo.toml b/rust/scx_rustland_core/Cargo.toml
@@ -7,12 +7,6 @@ license = "GPL-2.0-only"
 repository = "https://github.com/sched-ext/scx"
 description = "Framework to implement sched_ext schedulers running in user space"
 
-include = [
-    "src/bpf/intf.h",
-    "src/bpf/main.bpf.c",
-    "src/bpf.rs",
-]
-
 [dependencies]
 anyhow = "1.0"
 libbpf-rs = "0.23"
@@ -24,3 +18,13 @@ scx_utils = { path = "../scx_utils", version = "0.7" }
 tar = "0.4"
 walkdir = "2.4"
 scx_utils = { path = "../scx_utils", version = "0.7" }
+
+[lib]
+name = "scx_rustland_core"
+path = "src/lib.rs"
+
+include = [
+    "assets/bpf/intf.h",
+    "assets/bpf/main.bpf.c",
+    "assets/bpf.rs",
+]
diff --git a/rust/scx_rustland_core/src/bpf.rs → rust/scx_rustland_core/assets/bpf.rs b/rust/scx_rustland_core/src/bpf.rs → rust/scx_rustland_core/assets/bpf.rs
diff --git a/rust/scx_rustland_core/src/bpf/intf.h → rust/scx_rustland_core/assets/bpf/intf.h b/rust/scx_rustland_core/src/bpf/intf.h → rust/scx_rustland_core/assets/bpf/intf.h
diff --git a/rust/scx_rustland_core/src/bpf/main.bpf.c → rust/scx_rustland_core/assets/bpf/main.bpf.c b/rust/scx_rustland_core/src/bpf/main.bpf.c → rust/scx_rustland_core/assets/bpf/main.bpf.c
diff --git a/rust/scx_rustland_core/src/rustland_builder.rs b/rust/scx_rustland_core/src/rustland_builder.rs
@@ -30,9 +30,9 @@ impl RustLandBuilder {
 
     pub fn build(&mut self) -> Result<()> {
         // Embed the BPF source files.
-        let intf = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/bpf/intf.h"));
-        let skel = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/bpf/main.bpf.c"));
-        let bpf = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/bpf.rs"));
+        let intf = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/bpf/intf.h"));
+        let skel = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/bpf/main.bpf.c"));
+        let bpf = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/bpf.rs"));
 
         // Generate BPF backend code (C).
         self.create_file("intf.h", intf);