Regenerate with the latest rextendr (#22)

.Rbuildignore

@@ -4,3 +4,4 @@
 ^tests/testthat/_snaps$
 ^\.github$
 
+^src/\.cargo$

DESCRIPTION

@@ -18,3 +18,4 @@ RoxygenNote: 7.2.3
 Suggests:
     rmarkdown,
     testthat
+Config/rextendr/version: 0.3.1.9000

R/extendr-wrappers.R

@@ -1,11 +1,5 @@
-# Generated by extendr: Do not edit by hand
-
 # nolint start
 
-#
-# This file was created with the following call:
-#   .Call("wrap__make_helloextendr_wrappers", use_symbols = TRUE, package_name = "helloextendr")
-
 #' @docType package
 #' @usage NULL
 #' @useDynLib helloextendr, .registration = TRUE
@@ -15,5 +9,4 @@ NULL
 #' @export
 hello_world <- function() .Call(wrap__hello_world)
 
-
 # nolint end

src/.gitignore

@@ -2,3 +2,4 @@
 *.so
 *.dll
 target
+.cargo

src/Makevars

@@ -7,12 +7,21 @@ all: C_clean
 
 $(SHLIB): $(STATLIB)
 
+CARGOTMP = $(CURDIR)/.cargo
+
 $(STATLIB):
 	# In some environments, ~/.cargo/bin might not be included in PATH, so we need
 	# to set it here to ensure cargo can be invoked. It is appended to PATH and
 	# therefore is only used if cargo is absent from the user's PATH.
-	export PATH="$(PATH):$(HOME)/.cargo/bin" && \
+	if [ "$(NOT_CRAN)" != "true" ]; then \
+		export CARGO_HOME=$(CARGOTMP); \
+	fi && \
+		export PATH="$(PATH):$(HOME)/.cargo/bin" && \
 		cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR)
+	if [ "$(NOT_CRAN)" != "true" ]; then \
+		rm -Rf $(CARGOTMP) && \
+		rm -Rf $(LIBDIR)/build; \
+	fi
 
 C_clean:
 	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS)

src/Makevars.win

@@ -9,6 +9,8 @@ all: C_clean
 
 $(SHLIB): $(STATLIB)
 
+CARGOTMP = $(CURDIR)/.cargo
+
 $(STATLIB):
 	mkdir -p $(TARGET_DIR)/libgcc_mock
 	# `rustc` adds `-lgcc_eh` flags to the compiler, but Rtools' GCC doesn't have
@@ -20,12 +22,19 @@ $(STATLIB):
 	touch $(TARGET_DIR)/libgcc_mock/libgcc_eh.a
 
 	# CARGO_LINKER is provided in Makevars.ucrt for R >= 4.2
-	export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
+	if [ "$(NOT_CRAN)" != "true" ]; then \
+		export CARGO_HOME=$(CARGOTMP); \
+	fi && \
+		export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
 		export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \
 		cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR)
+	if [ "$(NOT_CRAN)" != "true" ]; then \
+		rm -Rf $(CARGOTMP) && \
+		rm -Rf $(LIBDIR)/build; \
+	fi
 
 C_clean:
 	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS)
 
 clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) rust/target
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)

src/rust/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = 'helloextendr'
+publish = false
 version = '0.3.0'
 edition = '2021'