Skip to content

Commit 9f95c66

Browse files
committed
Merge branch 'devel'
2 parents c12db96 + 8295a2b commit 9f95c66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+594
-172
lines changed

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RLumBuild
22
Type: Package
33
Title: RLum Universe Package Building
4-
Version: 0.1.7
5-
Date: 2024-02-12
4+
Version: 0.1.8.9000-8
5+
Date: 2024-08-20
66
Author: Sebastian Kreutzer [aut, cre] (<https://orcid.org/0000-0002-0734-2199>),
77
Christoph Burow [aut] (<https://orcid.org/0000-0002-5023-4046>)
88
Authors@R: c(
@@ -36,4 +36,4 @@ Imports:
3636
xtable (>= 1.8-4)
3737
Encoding: UTF-8
3838
LazyData: true
39-
RoxygenNote: 7.3.1
39+
RoxygenNote: 7.3.2

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export(module_update_zenodoJSON)
2424
export(module_verify_ExampleTimings)
2525
export(module_write_BibTeX)
2626
export(module_write_FunctionList)
27+
export(module_write_PDF_manual)
2728
export(module_write_codemetar)
2829
import(utils)
2930
importFrom(grDevices,dev.off)

NEWS.Rmd

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ header-includes:
88

99
# News for package 'RLumBuild'
1010

11-
## Changes in version `r RLumBuild::.get_pkg_version()` (`r Sys.Date()`)
12-
* `module_add_HowToCite()`: remove argument defunct by `stringi`
13-
* `module_add_HowToCite()`: exclude `-package` file from parsing
14-
* `module_add_RLumTeam()`: exclude `-package` file from parsing
11+
* Fix `module_add_HowToCite()`
12+
* Add `module_write_PDF_manual()`

NEWS.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,5 @@
77

88
# News for package ‘RLumBuild’
99

10-
## Changes in version 0.1.7 (2024-02-12)
11-
12-
- `module_add_HowToCite()`: remove argument defunct by `stringi`
13-
- `module_add_HowToCite()`: exclude `-package` file from parsing
14-
- `module_add_RLumTeam()`: exclude `-package` file from parsing
10+
- Fix `module_add_HowToCite()`
11+
- Add `module_write_PDF_manual()`

R/RLumBuild-package.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@
2626
#' @importFrom grDevices dev.off pdf
2727
#' @importFrom graphics abline barplot text plot
2828
#'
29-
#' @docType package
3029
#' @md
31-
NULL
30+
"_PACKAGE"

R/build_package.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@ build_package <- function(
154154
if(!"module_verify_ExampleTimings" %in% exclude)
155155
.run_module(text = "Verify example timings ...", f = module_verify_ExampleTimings())
156156

157-
158157
# # Build PDF manual ------------------------------------------------------------------------
159-
.run_module(text = "Build PDF manual ...", f = devtools::build_manual(pkg = ".", path = paste0(pkg_name,".BuildResults/")))
158+
.run_module(text = "Build PDF manual ...", f = module_write_PDF_manual())
160159

161160
## Outro -------------------------------------------------------------------------------
162161
cat("\n")

R/module_add_HowToCite.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ module_add_HowToCite <- function(){
8383
file.list.man <- list.files("man/", recursive = TRUE, include.dirs = FALSE, pattern = "\\.Rd")
8484

8585
## remove package Rd, this causes some problems
86-
file.list.man <- file.list.man[grepl("-package", file.list.man, fixed = TRUE)]
86+
file.list.man <- file.list.man[!grepl("-package", file.list.man, fixed = TRUE)]
8787

8888
# build package citation
8989
pkg.authors <- character()
@@ -224,7 +224,7 @@ module_add_HowToCite <- function(){
224224
##write BibTeX file
225225
bib_file <- paste0(DESC_PACKAGE,".BuildResults/", DESC_PACKAGE,"_",DESC_VERSION,"-fun_bibliography.bib")
226226

227-
##check if exsits or not
227+
##check if exits or not
228228
if(!file.exists(bib_file))
229229
write(x = character(), file = bib_file)
230230

R/module_write_PDF_manual.R

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#' Create PDF Manual
2+
#'
3+
#' @description Build PDF Manual tar.gz is available
4+
#'
5+
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
6+
#'
7+
#' @section Function version: 0.1.0
8+
#'
9+
#' @seealso [devtools::build_manual]
10+
#'
11+
#' @export
12+
module_write_PDF_manual <- function(){
13+
devtools::build_manual(pkg = ".", path = paste0(.get_pkg_name(),".BuildResults/"))
14+
15+
return(TRUE)
16+
17+
}

0 commit comments

Comments
 (0)