Tweak

.github/workflows/release.yml

@@ -122,9 +122,6 @@ jobs:
         # The two platforms don't agree on how to talk about env vars but they
         # do agree on 'cat' and '$()' so we use that to marshal values between commands.
         run: |
-          # TODO: this cannot be built
-          rm -rf ./savvy
-
           # Actually do builds and make zips and whatnot
           cargo dist build --tag=${{ github.ref_name }} --output-format=json ${{ matrix.dist-args }} > dist-manifest.json
           echo "dist ran successfully"

Cargo.toml

@@ -3,7 +3,7 @@ members = ["savvy", "savvy-macro", "savvy-bindgen"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 authors = ["Hiroaki Yutani"]
 license = "MIT"

savvy-macro/Cargo.toml

@@ -6,9 +6,6 @@ authors.workspace = true
 license.workspace = true
 repository.workspace = true
 
-[package.metadata.dist]
-dist = false
-
 [lib]
 proc-macro = true
 

savvy/Cargo.toml

@@ -6,9 +6,6 @@ authors.workspace = true
 license.workspace = true
 repository.workspace = true
 
-[package.metadata.dist]
-dist = false
-
 [dependencies]
 libR-sys = { git = "https://github.com/extendr/libR-sys" }
 once_cell = "1"

savvy/build.rs

@@ -1,13 +1,16 @@
 use std::path::Path;
 
 fn main() {
-    let r_include_dir =
-        std::env::var("R_INCLUDE_DIR").expect("R_INCLUDE_DIR envvar must be provided.");
+    let r_include_dir = std::env::var("R_INCLUDE_DIR");
 
-    cc::Build::new()
-        .file("src/unwind_protect_wrapper.c")
-        .include(Path::new(&r_include_dir))
-        .compile("unwind_protect");
+    if let Ok(d) = r_include_dir {
+        cc::Build::new()
+            .file("src/unwind_protect_wrapper.c")
+            .include(Path::new(d.as_str()))
+            .compile("unwind_protect");
+    } else {
+        eprintln!("R_INCLUDE_DIR envvar must be provided.");
+    }
 
     println!("cargo:rerun-if-changed=src/unwind_protect_wrapper.c");
 }