Update

.github/workflows/check-full.yaml

@@ -110,10 +110,6 @@ jobs:
 
           (
             export LIBRSYS_R_VERSION="$(Rscript ./tools/print_r_version.R)"
-            # TODO: need to tweak libR-sys
-            export R_HOME="foo"
-            export R_INCLUDE_DIR="foo"
-
             . "${HOME}/.cargo/env"
             cd ./check/string2path.Rcheck/00_pkg_src/string2path/src/rust/
             cargo build --target=aarch64-apple-darwin --lib --release --offline

inst/COPYRIGHTS

@@ -14,188 +14,215 @@ licenses are the same as listed here.
 ===============================
 
 Name:    arrayvec
+Version: 0.7.2
 Authors: bluss
 License: MIT OR Apache-2.0
 Files:   vendor/arrayvec/*
 
 ------------------------------
 
 Name:    autocfg
+Version: 1.1.0
 Authors: Josh Stone
 License: Apache-2.0 OR MIT
 Files:   vendor/autocfg/*
 
 ------------------------------
 
 Name:    cfg-if
+Version: 1.0.0
 Authors: Alex Crichton
 License: MIT/Apache-2.0
 Files:   vendor/cfg-if/*
 
 ------------------------------
 
 Name:    euclid
+Version: 0.22.7
 Authors: The Servo Project Developers
 License: MIT / Apache-2.0
 Files:   vendor/euclid/*
 
 ------------------------------
 
 Name:    extendr-api
+Version: 0.3.1
 Authors: andy-thomason, Thomas Down, Mossa Merhi Reimert, Claus O. Wilke, Hiroaki Yutani, Ilia A. Kosenkov
 License: MIT
 Files:   vendor/extendr-api/*
 
 ------------------------------
 
 Name:    extendr-engine
+Version: 0.3.1
 Authors: andy-thomason, Thomas Down, Mossa Merhi Reimert, Claus O. Wilke, Hiroaki Yutani, Ilia A. Kosenkov
 License: MIT
 Files:   vendor/extendr-engine/*
 
 ------------------------------
 
 Name:    extendr-macros
+Version: 0.3.1
 Authors: andy-thomason, Thomas Down, Mossa Merhi Reimert, Claus O. Wilke, Hiroaki Yutani, Ilia A. Kosenkov
 License: MIT
 Files:   vendor/extendr-macros/*
 
 ------------------------------
 
 Name:    float_next_after
+Version: 0.1.5
 Authors: Bronson Brown-deVost
 License: MIT
 Files:   vendor/float_next_after/*
 
 ------------------------------
 
 Name:    fontdb
+Version: 0.9.1
 Authors: Evgeniy Reizner
 License: MIT
 Files:   vendor/fontdb/*
 
 ------------------------------
 
 Name:    lazy_static
+Version: 1.4.0
 Authors: Marvin Löbel
 License: MIT/Apache-2.0
 Files:   vendor/lazy_static/*
 
 ------------------------------
 
 Name:    libc
+Version: 0.2.126
 Authors: The Rust Project Developers
 License: MIT OR Apache-2.0
 Files:   vendor/libc/*
 
 ------------------------------
 
 Name:    libR-sys
+Version: 0.3.0
 Authors: andy-thomason, Thomas Down, Mossa Merhi Reimert, Claus O. Wilke, Ilia Kosenkov, Hiroaki Yutani
 License: MIT
 Files:   vendor/libR-sys/*
 
 ------------------------------
 
 Name:    log
+Version: 0.4.17
 Authors: The Rust Project Developers
 License: MIT OR Apache-2.0
 Files:   vendor/log/*
 
 ------------------------------
 
 Name:    lyon
+Version: 1.0.0
 Authors: Nicolas Silva
 License: MIT/Apache-2.0
 Files:   vendor/lyon/*
 
 ------------------------------
 
 Name:    lyon_algorithms
+Version: 1.0.0
 Authors: Nicolas Silva
 License: MIT/Apache-2.0
 Files:   vendor/lyon_algorithms/*
 
 ------------------------------
 
 Name:    lyon_geom
+Version: 1.0.1
 Authors: Nicolas Silva
 License: MIT/Apache-2.0
 Files:   vendor/lyon_geom/*
 
 ------------------------------
 
 Name:    lyon_path
+Version: 1.0.0
 Authors: Nicolas Silva
 License: MIT/Apache-2.0
 Files:   vendor/lyon_path/*
 
 ------------------------------
 
 Name:    lyon_tessellation
+Version: 1.0.1
 Authors: Nicolas Silva
 License: MIT/Apache-2.0
 Files:   vendor/lyon_tessellation/*
 
 ------------------------------
 
 Name:    memmap2
+Version: 0.5.5
 Authors: Dan Burkert, Yevhenii Reizner
 License: MIT/Apache-2.0
 Files:   vendor/memmap2/*
 
 ------------------------------
 
 Name:    num-traits
+Version: 0.2.15
 Authors: The Rust Project Developers
 License: MIT OR Apache-2.0
 Files:   vendor/num-traits/*
 
 ------------------------------
 
 Name:    once_cell
+Version: 1.13.0
 Authors: Aleksey Kladov
 License: MIT OR Apache-2.0
 Files:   vendor/once_cell/*
 
 ------------------------------
 
 Name:    paste
+Version: 1.0.7
 Authors: David Tolnay
 License: MIT OR Apache-2.0
 Files:   vendor/paste/*
 
 ------------------------------
 
 Name:    proc-macro2
+Version: 1.0.40
 Authors: David Tolnay, Alex Crichton
 License: MIT OR Apache-2.0
 Files:   vendor/proc-macro2/*
 
 ------------------------------
 
 Name:    quote
+Version: 1.0.20
 Authors: David Tolnay
 License: MIT OR Apache-2.0
 Files:   vendor/quote/*
 
 ------------------------------
 
 Name:    syn
+Version: 1.0.98
 Authors: David Tolnay
 License: MIT OR Apache-2.0
 Files:   vendor/syn/*
 
 ------------------------------
 
 Name:    ttf-parser
+Version: 0.15.2
 Authors: Yevhenii Reizner
 License: MIT OR Apache-2.0
 Files:   vendor/ttf-parser/*
 
 ------------------------------
 
 Name:    unicode-ident
+Version: 1.0.2
 Authors: David Tolnay
 License: (MIT OR Apache-2.0) AND Unicode-DFS-2016
 Files:   vendor/unicode-ident/*

src/cargo_vendor_config.toml

@@ -3,12 +3,12 @@ replace-with = "vendored-sources"
 
 [source."https://github.com/yutannihilation/extendr.git"]
 git = "https://github.com/yutannihilation/extendr.git"
-rev = "263648f0e4853d18b8c0ed5f5fec071875e028a1"
+rev = "9f1df33636cc5940474bc6707103aa6275d3816e"
 replace-with = "vendored-sources"
 
 [source."https://github.com/yutannihilation/libR-sys.git"]
 git = "https://github.com/yutannihilation/libR-sys.git"
-rev = "11ea1b837cb644a9f03fd4b0bfccfa7acca337ac"
+rev = "96703227e308b207b9ea33c379029a4bab83cd10"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]

src/rust/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["staticlib"]
 
 [dependencies]
-extendr-api = { git = "https://github.com/yutannihilation/extendr.git", rev = "263648f0e4853d18b8c0ed5f5fec071875e028a1" }
+extendr-api = { git = "https://github.com/yutannihilation/extendr.git", rev = "9f1df33636cc5940474bc6707103aa6275d3816e" }
 fontdb = "0.9.1"
 lyon = "1.0"
 once_cell = "1.13.0"

src/rust/vendor.sh

@@ -14,6 +14,10 @@ tar \
   --file=vendor.tar.xz \
   vendor
 
-echo "############################################"
-echo "  UPDATE src/cargo_vendor_config.toml !!!"
-echo "############################################"
+echo
+echo
+echo "#############################################"
+echo "#                                           #"
+echo "#  UPDATE src/cargo_vendor_config.toml !!!  #"
+echo "#                                           #"
+echo "#############################################"

tools/update_copyrights.R

@@ -6,6 +6,7 @@ manifests <- list.files(VENDOR_PATH, pattern = "Cargo.toml", recursive = TRUE)
 l <- lapply(manifests, \(x) RcppTOML::parseTOML(file.path(VENDOR_PATH, x))$package)
 
 names <- vapply(l, \(x) x[["name"]], FUN.VALUE = character(1L))
+versions <- vapply(l, \(x) x[["version"]], FUN.VALUE = character(1L))
 
 authors <- vapply(l, \(x) {
   # Remove email addresses
@@ -38,6 +39,7 @@ licenses are the same as listed here.
 
 cat(paste(
   "Name:    ", names,    "\n",
+  "Version: ", versions, "\n",
   "Authors: ", authors,  "\n",
   "License: ", licenses, "\n",
   "Files:   ", files,    "\n",