Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
RLumSK committed Aug 20, 2024
2 parents c12db96 + 8295a2b commit 9f95c66
Show file tree
Hide file tree
Showing 41 changed files with 594 additions and 172 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: RLumBuild
Type: Package
Title: RLum Universe Package Building
Version: 0.1.7
Date: 2024-02-12
Version: 0.1.8.9000-8
Date: 2024-08-20
Author: Sebastian Kreutzer [aut, cre] (<https://orcid.org/0000-0002-0734-2199>),
Christoph Burow [aut] (<https://orcid.org/0000-0002-5023-4046>)
Authors@R: c(
Expand Down Expand Up @@ -36,4 +36,4 @@ Imports:
xtable (>= 1.8-4)
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export(module_update_zenodoJSON)
export(module_verify_ExampleTimings)
export(module_write_BibTeX)
export(module_write_FunctionList)
export(module_write_PDF_manual)
export(module_write_codemetar)
import(utils)
importFrom(grDevices,dev.off)
Expand Down
6 changes: 2 additions & 4 deletions NEWS.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@ header-includes:

# News for package 'RLumBuild'

## Changes in version `r RLumBuild::.get_pkg_version()` (`r Sys.Date()`)
* `module_add_HowToCite()`: remove argument defunct by `stringi`
* `module_add_HowToCite()`: exclude `-package` file from parsing
* `module_add_RLumTeam()`: exclude `-package` file from parsing
* Fix `module_add_HowToCite()`
* Add `module_write_PDF_manual()`
7 changes: 2 additions & 5 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@

# News for package ‘RLumBuild’

## Changes in version 0.1.7 (2024-02-12)

- `module_add_HowToCite()`: remove argument defunct by `stringi`
- `module_add_HowToCite()`: exclude `-package` file from parsing
- `module_add_RLumTeam()`: exclude `-package` file from parsing
- Fix `module_add_HowToCite()`
- Add `module_write_PDF_manual()`
3 changes: 1 addition & 2 deletions R/RLumBuild-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@
#' @importFrom grDevices dev.off pdf
#' @importFrom graphics abline barplot text plot
#'
#' @docType package
#' @md
NULL
"_PACKAGE"
3 changes: 1 addition & 2 deletions R/build_package.R
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,8 @@ build_package <- function(
if(!"module_verify_ExampleTimings" %in% exclude)
.run_module(text = "Verify example timings ...", f = module_verify_ExampleTimings())


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

## Outro -------------------------------------------------------------------------------
cat("\n")
Expand Down
4 changes: 2 additions & 2 deletions R/module_add_HowToCite.R
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module_add_HowToCite <- function(){
file.list.man <- list.files("man/", recursive = TRUE, include.dirs = FALSE, pattern = "\\.Rd")

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

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

##check if exsits or not
##check if exits or not
if(!file.exists(bib_file))
write(x = character(), file = bib_file)

Expand Down
17 changes: 17 additions & 0 deletions R/module_write_PDF_manual.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#' Create PDF Manual
#'
#' @description Build PDF Manual tar.gz is available
#'
#' @author Sebastian Kreutzer, Institute of Geography, Heidelberg University (Germany)
#'
#' @section Function version: 0.1.0
#'
#' @seealso [devtools::build_manual]
#'
#' @export
module_write_PDF_manual <- function(){
devtools::build_manual(pkg = ".", path = paste0(.get_pkg_name(),".BuildResults/"))

return(TRUE)

}
Binary file not shown.
35 changes: 0 additions & 35 deletions RLumBuild.BuildResults/RLumBuild_0.1.7-Functions.csv

This file was deleted.

44 changes: 0 additions & 44 deletions RLumBuild.BuildResults/RLumBuild_0.1.7-Functions.tex

This file was deleted.

Binary file removed RLumBuild.BuildResults/RLumBuild_0.1.7.pdf
Binary file not shown.
Binary file removed RLumBuild.BuildResults/RLumBuild_0.1.7.tar.gz
Binary file not shown.
Loading

0 comments on commit 9f95c66

Please sign in to comment.