Skip to content

cpp11 dynlib #1921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 14, 2023
Merged

cpp11 dynlib #1921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c9feedb
cpp11 dynlib
pachadotdev Nov 10, 2023
4404d65
Hadley's suggestion
pachadotdev Nov 11, 2023
a6f6167
cpp11 test
pachadotdev Nov 13, 2023
dcbdde1
cpp11 test
pachadotdev Nov 13, 2023
ad72cd1
https://github.com/r-lib/usethis/pull/1921#discussion_r1391780839
pachadotdev Nov 14, 2023
2e77417
Add news bullet
hadley Nov 14, 2023
ec385e2
Tweak test; require use_package_doc()
hadley Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
^internal$
^revdep-cloud$
^CRAN-SUBMISSION$
^\.vscode$
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# usethis (development version)

* `use_cpp11()` now automatically updates the `NAMESPACE` (@pachadotdev, #1921).

# usethis 2.2.2

* Implicit usage of `numeric_version()` via comparison now always provides
Expand Down
6 changes: 6 additions & 0 deletions R/cpp11.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use_cpp11 <- function() {
check_installed("cpp11")
check_is_package("use_cpp11()")
check_uses_roxygen("use_cpp11()")
check_has_package_doc("use_cpp11()")
use_src()

use_dependency("cpp11", "LinkingTo")
Expand All @@ -24,6 +25,11 @@ use_cpp11 <- function() {

check_cpp_register_deps()

roxygen_ns_append(
sprintf("@useDynLib %s, .registration = TRUE", project_name())
)
roxygen_update_ns()

invisible()
}

Expand Down
9 changes: 8 additions & 1 deletion tests/testthat/test-cpp11.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ test_that("use_cpp11() requires a package", {
test_that("use_cpp11() creates files/dirs, edits DESCRIPTION and .gitignore", {
create_local_package()
use_roxygen_md()
use_package_doc()

local_interactive(FALSE)
local_check_installed()
local_mocked_bindings(check_cpp_register_deps = function() invisible())
local_mocked_bindings(
check_cpp_register_deps = function() invisible()
# project_name = function() "testpkg"
)

use_cpp11()

Expand All @@ -21,6 +25,9 @@ test_that("use_cpp11() creates files/dirs, edits DESCRIPTION and .gitignore", {

ignores <- read_utf8(proj_path("src", ".gitignore"))
expect_true(all(c("*.o", "*.so", "*.dll") %in% ignores))

namespace <- read_utf8(proj_path("NAMESPACE"))
expect_true(any(grepl("useDynLib", namespace)))
})

test_that("check_cpp_register_deps is silent if all installed, emits todo if not", {
Expand Down