Merge pull request #2840 from ruby/crates-0.2.0

Crates 0.1.1

Author: soutaro

rust/Cargo.lock

@@ -1,12 +1,19 @@
 [package]
 name = "ruby-rbs-sys"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2024"
 license = "BSD-2-Clause"
 description = "Low-level FFI bindings for RBS -- the type signature language for Ruby programs"
 homepage = "https://github.com/ruby/rbs"
 repository = "https://github.com/ruby/rbs.git"
 readme = "../../README.md"
+include = [
+    "src/**/*",
+    "vendor/**/*",
+    "build.rs",
+    "wrapper.h",
+    "Cargo.toml",
+]
 
 [lib]
 doctest = false

rust/ruby-rbs-sys/Cargo.toml

@@ -6,11 +6,12 @@ use std::{
 };
 
 fn main() -> Result<(), Box<dyn Error>> {
-    let root = root_dir()?;
-    let include = root.join("include");
-    let src = root.join("src");
+    let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
+    let vendor_rbs = manifest_dir.join("vendor/rbs");
+    let include = vendor_rbs.join("include");
+    let c_src = vendor_rbs.join("src");
 
-    build(&include, &src)?;
+    build(&include, &c_src)?;
 
     let bindings = generate_bindings(&include)?;
     write_bindings(&bindings)?;
@@ -32,38 +33,6 @@ fn build(include_dir: &Path, src_dir: &Path) -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-fn root_dir() -> Result<PathBuf, Box<dyn Error>> {
-    // Allow overriding via environment variable (useful for packaging)
-    if let Ok(source_dir) = env::var("RBS_SOURCE_DIR") {
-        let root = PathBuf::from(source_dir);
-        let include_dir = root.join("include");
-        let src_dir = root.join("src");
-
-        if include_dir.exists() && src_dir.exists() {
-            return Ok(root);
-        } else {
-            return Err(format!(
-                "RBS_SOURCE_DIR is set to {:?}, but include/ and src/ directories not found",
-                root
-            )
-            .into());
-        }
-    }
-
-    let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
-
-    // Try workspace structure (development)
-    if let Some(workspace_root) = manifest_dir.ancestors().nth(2) {
-        let include_dir = workspace_root.join("include");
-        let src_dir = workspace_root.join("src");
-
-        if include_dir.exists() && src_dir.exists() {
-            return Ok(workspace_root.to_path_buf());
-        }
-    }
-
-    Err("Cannot find include/ and src/ directories. Set RBS_SOURCE_DIR environment variable to the repository root.".into())
-}
 
 fn source_files<P: AsRef<Path>>(root_dir: P) -> Result<Vec<String>, Box<dyn Error>> {
     let mut files = Vec::new();

rust/ruby-rbs-sys/build.rs

@@ -0,0 +1 @@
+../../../../include

rust/ruby-rbs-sys/vendor/rbs/include

@@ -0,0 +1 @@
+../../../../src

rust/ruby-rbs-sys/vendor/rbs/src

@@ -1,12 +1,18 @@
 [package]
 name = "ruby-rbs"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2024"
 license = "BSD-2-Clause"
 description = "Rust bindings for RBS -- the type signature language for Ruby programs"
 homepage = "https://github.com/ruby/rbs"
 repository = "https://github.com/ruby/rbs.git"
 readme = "../../README.md"
+include = [
+    "src/**/*",
+    "vendor/**/*",
+    "build.rs",
+    "Cargo.toml",
+]
 
 [dependencies]
 ruby-rbs-sys = { version = "0.1", path = "../ruby-rbs-sys" }

rust/ruby-rbs/Cargo.toml

@@ -51,16 +51,12 @@ impl Node {
 }
 
 fn main() -> Result<(), Box<dyn Error>> {
-    // Allow overriding the source directory via environment variable (useful for packaging)
-    let config_path = if let Ok(source_dir) = env::var("RBS_SOURCE_DIR") {
-        Path::new(&source_dir).join("config.yml")
-    } else {
-        Path::new(env!("CARGO_MANIFEST_DIR")).join("../../config.yml")
-    };
+    let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
+    let config_path = manifest_dir.join("vendor/rbs/config.yml");
 
     let config_path = config_path.canonicalize().map_err(|e| {
         format!(
-            "Failed to find config.yml at {:?}: {}. Set RBS_SOURCE_DIR environment variable to the repository root.",
+            "Failed to find config.yml at {:?}: {}",
             config_path, e
         )
     })?;

rust/ruby-rbs/build.rs

@@ -0,0 +1 @@
+../../../../config.yml