aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-10-02 13:26:09 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-10-02 13:26:09 +0200
commit4cc35d77e9ce6fb46f5ba37350a281bf0a82f286 (patch)
treea3722e99ab8b717600780f734ff5bc875a7e72e7
parentb0d13f9b893f84d342bcb9e315777353aa152a78 (diff)
Some maintenance
-rw-r--r--.Rbuildignore38
-rw-r--r--GNUmakefile3
2 files changed, 20 insertions, 21 deletions
diff --git a/.Rbuildignore b/.Rbuildignore
index f201e26d..7849f71d 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,26 +1,26 @@
+build.log
+check.log
GNUmakefile
-README.html
-gmkin_screenshot.png
+index.r
^inst/web$
+mkin.Rcheck
+README.html
+^Rplots.pdf$
+test.log
+test.R
^vignettes/.build.timestamp$
-^vignettes/*.out$
-^vignettes/*.toc$
+^vignettes/*_cache$
+^vignettes/*_files$
+^vignettes/*.aux$
^vignettes/*.bbl$
^vignettes/*.blg$
-^vignettes/*.aux$
-^vignettes/*.log$
-^vignettes/*.fls$
-^vignettes/*.fdb_latexmk$
-^vignettes/mkin.tex$
^vignettes/*.concordance.tex$
-vignettes/*.synctex.gz
-^vignettes/FOCUS_Z.tex$
-^vignettes/*_cache$
-^vignettes/*_files$
+^vignettes/*.fdb_latexmk$
+^vignettes/*.fls$
+^vignettes/*.log$
+^vignettes/*.out$
+^vignettes/*.synctex.gz
+^vignettes/*.toc$
^vignettes/figure
-^Rplots.pdf$
-test.log
-test.R
-check.log
-build.log
-index.r
+^vignettes/FOCUS_Z.tex$
+^vignettes/mkin.tex$
diff --git a/GNUmakefile b/GNUmakefile
index ff8958cb..6534a71e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -52,7 +52,7 @@ quickinstall: build-no-vignettes
"$(RBIN)/R" CMD INSTALL $(TGZVNR)
check: build
- "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ) 2>&1 | tee check.log
+ "$(RBIN)/R" CMD check --as-cran --no-tests $(TGZ)
quickcheck: build-no-vignettes
mv $(TGZVNR) $(TGZ)
@@ -60,7 +60,6 @@ quickcheck: build-no-vignettes
mv $(TGZ) $(TGZVNR)
clean:
- $(RM) -r $(PKGNAME).Rcheck/
$(RM) -r vignettes/*.bbl
$(RM) -r vignettes/*.blg
$(RM) -r vignettes/*.fls

Contact - Imprint