Skip to content

Commit

Permalink
chore: Adds support for R4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
andyquinterom committed Jun 13, 2024
1 parent 6948a44 commit 3c46d5b
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
^src/rust/.vscode$
^src/rust/vendor$
^src/rust/target$
^src/orbweaver.so$

^_pkgdown\.yml$
^docs$
Expand All @@ -25,4 +26,6 @@

^update_authors\.R$
^src/\.cargo$
^src/rust/\.cargo$
^src/orbweaver\.so$
^Makefile
6 changes: 3 additions & 3 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,21 @@ name = 'orbweaver'

[dependencies]
# extendr-api = { version = "0.6", features = ["serde"] }
extendr-api = { git = "https://github.com/extendr/extendr.git", rev = "544b38b141640199aaee86e589abaf8ec73c6601" }
extendr-api = { git = "https://github.com/extendr/extendr.git", rev = "cb85a21a90c3fcb538a40fcea03058454edb3dac" }
orbweaver = { version = "0.10.1" }

# This will help us filter the platforms
# we support to make the final bundle size
# smaller
[package.metadata.vendor-filter]
platforms = [
# Linux
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
# Windows
"x86_64-pc-windows-gnu",
# MacOS
"x86_64-apple-darwin",
"aarch64-apple-darwin"
]
all-features = true
3 changes: 2 additions & 1 deletion src/rust/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.PHONY: vendor

vendor:
cargo vendor
cargo vendor-filterer > vendor-config.toml
tar -cJf vendor.tar.xz vendor/
rm -rf vendor/
8 changes: 4 additions & 4 deletions src/rust/vendor-config.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[source.crates-io]
replace-with = "vendored-sources"

[source."git+https://github.com/extendr/extendr.git?rev=544b38b141640199aaee86e589abaf8ec73c6601"]
[source."git+https://github.com/extendr/extendr.git?rev=cb85a21a90c3fcb538a40fcea03058454edb3dac"]
git = "https://github.com/extendr/extendr.git"
rev = "544b38b141640199aaee86e589abaf8ec73c6601"
rev = "cb85a21a90c3fcb538a40fcea03058454edb3dac"
replace-with = "vendored-sources"

[source."git+https://github.com/extendr/libR-sys?rev=09d76ada0cd54aa4481d9f06bbdfa50bcca2814a"]
[source."git+https://github.com/extendr/libR-sys?rev=b26b858230a5ab9675b2b69eea74ababc9a895c9"]
git = "https://github.com/extendr/libR-sys"
rev = "09d76ada0cd54aa4481d9f06bbdfa50bcca2814a"
rev = "b26b858230a5ab9675b2b69eea74ababc9a895c9"
replace-with = "vendored-sources"

[source.vendored-sources]
Expand Down
Binary file modified src/rust/vendor.tar.xz
Binary file not shown.

0 comments on commit 3c46d5b

Please sign in to comment.