diff --git a/rules.mk b/rules.mk index 81517279..8cf09464 100644 --- a/rules.mk +++ b/rules.mk @@ -15,7 +15,7 @@ PKG = $(shell perl -ne 'print $$1 if /Package:\s+((\w+[-\.]?)+)/;' DESCRIPTION) VERSION = $(shell perl -ne 'print $$1 if /Version:\s+((\d+[-\.]?)+)/;' DESCRIPTION) PKGVERS = $(PKG)_$(VERSION) TARBALL = $(PKGVERS).tar.gz -SOURCE = $(sort $(wildcard R/*R src/*.c src/*.h data/* examples/*)) +SOURCE = $(sort $(wildcard R/*R src/*.c src/*.cc src/*.h data/* examples/*)) CSOURCE = $(sort $(wildcard src/*.c)) TESTS = $(sort $(wildcard tests/*R)) INSTDOCS = $(sort $(wildcard inst/doc/*)) @@ -58,8 +58,7 @@ qcheck: CHECK = devtools::check($(COMMON_CHECK_ARGS),cran=FALSE,\ args=c("--no-tests")) qqcheck: CHECK = devtools::check($(COMMON_CHECK_ARGS),cran=FALSE,\ args=c("--no-tests","--no-codoc","--no-examples")) -xcheck: CHECK = devtools::check($(COMMON_CHECK_ARGS),cran=TRUE,\ -env_vars=c("_R_CHECK_DEPENDS_ONLY_"="TRUE")) +xcheck: CHECK = devtools::check($(COMMON_CHECK_ARGS),cran=TRUE) ycheck: CHECK = devtools::check($(COMMON_CHECK_ARGS),cran=TRUE,\ args=c("--run-dontrun","--run-donttest")) diff --git a/tools/check.env b/tools/check.env index a2004121..95ee1c45 100644 --- a/tools/check.env +++ b/tools/check.env @@ -20,6 +20,7 @@ _R_CHECK_COMPILATION_FLAGS_=true _R_CHECK_CONNECTIONS_LEFT_OPEN_=true _R_CHECK_CRAN_INCOMING_=false _R_CHECK_DATALIST_=true +_R_CHECK_DEPENDS_ONLY_=false _R_CHECK_DEPRECATED_DEFUNCT_=true _R_CHECK_DONTTEST_EXAMPLES_=false _R_CHECK_DOT_FIRSTLIB_=true @@ -39,6 +40,7 @@ _R_CHECK_LENGTH_1_CONDITION_ =package:_R_CHECK_PACKAGE_NAME_ _R_CHECK_LENGTH_1_LOGIC2_=package:_R_CHECK_PACKAGE_NAME_,abort,verbose _R_CHECK_LICENSE_=true _R_CHECK_LIMIT_CORES_=true +_R_CHECK_RD_MATH_RENDERING_=true _R_CHECK_MATRIX_DATA_=true _R_CHECK_NATIVE_ROUTINE_REGISTRATION_=true _R_CHECK_NO_RECOMMENDED_=true