Requests by CRAN

.gitignore

@@ -8,3 +8,4 @@ src/*.a
 src/myrustlib/target/*
 src/myrustlib/vendor.tar.xz
 src/myrustlib/vendor/*
+inst/AUTHORS

DESCRIPTION

@@ -1,10 +1,10 @@
 Package: hellorust
 Type: Package
 Title: Minimal Examples of Using Rust Code in R
-Version: 1.1.0
+Version: 1.1.1
 Authors@R: c(person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
     comment = c(ORCID = "0000-0002-4035-0289")),
-      person("Authors of the dependency Rust crates", role = "cph", comment = "see AUTHORS file"))
+      person("Authors of the dependency Rust crates", role = "aut", comment = "see AUTHORS file"))
 Description: Template R package with minimal setup to use Rust code in R without
     hacks or frameworks. Includes basic examples of importing cargo dependencies,
     spawning threads and passing numbers or strings from Rust to R. Cargo crates

NEWS

@@ -1,3 +1,7 @@
+1.1.1
+ - CRAN request: use role="aut" for rust dependencies
+ - CRAN request: use -j2 instead of CARGO_BUILD_JOBS=2
+
 1.1.0
  - Vendor cargo sources to comply with new CRAN guidlines
 

src/Makevars

@@ -7,15 +7,17 @@ PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
 
 $(SHLIB): $(STATLIB)
 
-# CRAN policy forbids using $HOME so we build in the current working dir.
+# CRAN policy forbids using $HOME so we build in the current working dir and
+# never use local cache. Also CRAN does not allow using more than 2 CPUs.
 # This makes things really slow because we have to reinstall all dependencies.
+# You can comment these things out if you do not submit to CRAN.
+CRANFLAGS=-j 2
 CARGOTMP=$(PWD)/.cargo
 export CARGO_HOME=$(CARGOTMP)
-export CARGO_BUILD_JOBS=2
 
 $(STATLIB):
 	if [ -f myrustlib/vendor.tar.xz ]; then tar xf myrustlib/vendor.tar.xz && mkdir -p $(CARGOTMP) && cp myrustlib/vendor-config.toml $(CARGOTMP)/config.toml; fi
-	PATH="${PATH}:${HOME}/.cargo/bin" cargo build --release --manifest-path=myrustlib/Cargo.toml
+	PATH="${PATH}:${HOME}/.cargo/bin" cargo build ${CRANFLAGS} --release --manifest-path=myrustlib/Cargo.toml
 	rm -Rf $(CARGOTMP) vendor || true # CRAN wants us to remove "detritus"
 	rm -Rf $(LIBDIR)/build || true