r/src/Makevars: Use MOOCORE_DEBUG isntead of DEBUG.

Author: MLopez-Ibanez

.github/workflows/R.yml

@@ -162,10 +162,11 @@ jobs:
         env:
           NOT_CRAN: false
         run: |
-          options(covr.flags=c(DEBUG="1"))
-          coverage <- covr::package_coverage(type="all", quiet=FALSE, clean = FALSE,
+          coverage <- withr::with_makevars(c(MOOCORE_DEBUG="1"),
+                        covr::package_coverage(type="all", quiet=FALSE, clean = FALSE,
                            commentDonttest = FALSE, commentDontrun = FALSE, flags="R",
                            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package"))
+          )
           print(coverage)
           covr::to_cobertura(coverage)
           list.files("../", pattern="*.xml", recursive=TRUE)

r/Makefile

@@ -89,7 +89,7 @@ check: build
 ifdef TEST
 	_R_CHECK_FORCE_SUGGESTS_=false NOT_CRAN=true $(Reval) 'devtools::test(filter="$(TEST)")'
 else
-	cd $(BINDIR) && (_R_CHECK_FORCE_SUGGESTS_=false NOT_CRAN=true DEBUG=1 R CMD check --run-donttest --run-dontrun --timings $(PACKAGE)_$(PACKAGEVERSION).tar.gz; cat $(PACKAGE).Rcheck/$(PACKAGE)-Ex.timings)
+	cd $(BINDIR) && (_R_CHECK_FORCE_SUGGESTS_=false NOT_CRAN=true MOOCORE_DEBUG=1 R CMD check --run-donttest --run-dontrun --timings $(PACKAGE)_$(PACKAGEVERSION).tar.gz; cat $(PACKAGE).Rcheck/$(PACKAGE)-Ex.timings)
 endif
 
 show:

r/src/Makevars

@@ -4,8 +4,8 @@
 # In particular, add the following to ~/.R/Makevars:
 # LTO_OPT=-flto
 LTO=$(LTO_OPT)
-DEBUG=0
-PKG_CPPFLAGS=-DR_PACKAGE -DDEBUG=$(DEBUG) -I./libmoocore/
+MOOCORE_DEBUG?=0
+PKG_CPPFLAGS=-DR_PACKAGE -DDEBUG=$(MOOCORE_DEBUG) -I./libmoocore/
 
 MOOCORE_SRC_FILES = hv3dplus.c hv4d.c hv_contrib.c hv.c hvapprox.c hvc3d.c pareto.c whv.c whv_hype.c avl.c eaf3d.c eaf.c io.c rng.c mt19937/mt19937.c
 SOURCES = $(MOOCORE_SRC_FILES:%=libmoocore/%) init.c Rmoocore.c
@@ -19,7 +19,7 @@ all: exes $(SHLIB)
 $(SHLIB): $(OBJECTS)
 
 exes: $(SHLIB)
-	$(MAKE) -C libmoocore all march=none CC="$(CC)" CFLAGS="$(CFLAGS)" WARN_CFLAGS="" OPT_CFLAGS="" DEBUG=$(DEBUG) EXE=$(EXEEXT) BINDIR=$(PWD)
+	$(MAKE) -C libmoocore all march=none CC="$(CC)" CFLAGS="$(CFLAGS)" WARN_CFLAGS="" OPT_CFLAGS="" DEBUG=$(MOOCORE_DEBUG) EXE=$(EXEEXT) BINDIR=$(PWD)
 	@-$(RM) libmoocore/*.o
 
 clean: