From 96dbf26adfad7f43df3857d12afadf1c25778357 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 22 Jul 2022 15:29:08 +0200 Subject: Move logs into own directory to clean root --- GNUmakefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'GNUmakefile') diff --git a/GNUmakefile b/GNUmakefile index 569e10ea..4ebb9d99 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -41,7 +41,7 @@ $(TGZ): $(pkgfiles) vignettes $(RM) -r vignettes/*.R $(RM) -r vignettes/web_only/*.R $(RM) Rplots.pdf - "$(RBIN)/R" CMD build . 2>&1 | tee build.log + "$(RBIN)/R" CMD build . 2>&1 | tee log/build.log roxygen: "$(RBIN)/Rscript" -e 'devtools::document()' @@ -64,10 +64,10 @@ quickinstall: build-no-vignettes "$(RBIN)/R" CMD INSTALL $(TGZVNR) check: roxygen build - _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee check.log + _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee log/check.log devcheck: roxygen build - _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RDEVBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee check_dev.log + _R_CHECK_CRAN_INCOMING_REMOTE_=false "$(RDEVBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee log/check_dev.log quickcheck: roxygen build-no-vignettes mv $(TGZVNR) $(TGZ) @@ -82,16 +82,16 @@ clean: $(RM) Rplots.pdf test: install - "$(RBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test.log - sed -i -e "s/.*\r.*\r//" test.log + "$(RBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee log/test.log + sed -i -e "s/.*\r.*\r//" log/test.log devtest: devinstall - "$(RDEVBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee test_dev.log - sed -i -e "s/\r.*\r//" test_dev.log + "$(RDEVBIN)/Rscript" -e 'options(cli.dynamic = TRUE); devtools::test()' 2>&1 | tee log/test_dev.log + sed -i -e "s/\r.*\r//" log/test_dev.log slowtests: install - NOT_CRAN=true "$(RBIN)/Rscript" -e 'cli.dynamic = TRUE); library(mkin); testthat::test_dir("tests/testthat/slow")' 2>&1 | tee tests_slow.log - sed -i -e "s/\r.*\r//" tests_slow.log + NOT_CRAN=true "$(RBIN)/Rscript" -e 'cli.dynamic = TRUE); library(mkin); testthat::test_dir("tests/testthat/slow")' 2>&1 | tee log/tests_slow.log + sed -i -e "s/\r.*\r//" log/tests_slow.log testcheck: roxygen test check -- cgit v1.2.1