Skip to content

Commit

Permalink
Update to correct an error on Solaris due to build flags not being po…
Browse files Browse the repository at this point in the history
…rtable
  • Loading branch information
bertcarnell committed Sep 7, 2021
1 parent b391667 commit 592a191
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 20 deletions.
8 changes: 7 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,11 @@ Version 1.1.0
Fixed underlying C++ for bosebushl orthogonal array algorithm.
Added regression tests

Verion 1.1.1
Version 1.1.1
Corrected memory leak and read out-of-bounds

Version 1.1.2
Exposed functions related to Galois fields from the oa C++ library

Version 1.1.3
Corrected compilation flag issue on Solaris
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: lhs
Title: Latin Hypercube Samples
Version: 1.1.2
Version: 1.1.3
Authors@R:
person(given = "Rob",
family = "Carnell",
Expand Down
15 changes: 8 additions & 7 deletions etc/CRAN_submission_checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,23 @@
- RStudio
- [ ] Document with `roxygen2` by running `Document` in the UI
- [ ] Run `testthat` tests by running `Test Package` in the UI
- [ ] Build the `.tar.gz` or `R CMD build`
- [ ] Run `check` or `R CMD check --as-cran`
- [ ] Build the `.tar.gz` or `R CMD build lhs`
- [ ] Run `check` or `R CMD check --as-cran lhs_<version>.tar.gz`
- [ ] In R, create the `pkgdown` site with `pkgdown::build_site()`
- [ ] `commit` and `push` all updates to `github`

#### rhub

- from R or RStudio
- [ ] `rhub::check_for_cran(path="path-to-package/lhs-<version>.tar.gz")`
- [ ] `rhub::check_with_valgrind(path="path-to-package/lhs-<version>.tar.gz")`
- [ ] `rhub::check_with_sanitizers(path="path-to-package/lhs-<version>.tar.gz")`
- [ ] `rhub::check_for_cran(path="path-to-package/lhs_<version>.tar.gz")`
- [ ] `rhub::check_with_valgrind(path="path-to-package/lhs_<version>.tar.gz")`
- [ ] `rhub::check_with_sanitizers(path="path-to-package/lhs_<version>.tar.gz")`
- [ ] `rhub::check_on_solaris(path="path-to-package/lhs_<version>.tar.gz", env_vars = c("_R_CHECK_FORCE_SUGGESTS_" = "false"))`

#### win-builder

- https://win-builder.r-project.org/upload.aspx
- [ ] upload the `lhs-<version>.tar.gz` from the step above
- [ ] upload the `lhs_<version>.tar.gz` from the step above

## Travis and Appveyor

Expand All @@ -66,7 +67,7 @@
- [ ] `sh developmentBuild.sh`
- [ ] `sh cmakeshell.sh`
- [ ] `R CMD build lhs`
- [ ] `R CMD check --as-cran --use-valgrind`
- [ ] `R CMD check --as-cran --use-valgrind lhs_<version>.tar.gz`

## Reverse Dependencies

Expand Down
10 changes: 0 additions & 10 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
PKG_CPPFLAGS=-DRCOMPILE
CXX_STD=CXX11
PKG_LIBS=-Wl,-S

#ifeq ($(CXX),g++)
#PKG_LIBS=-Wl,--strip-debug
#endif

#ifeq ($(CXX),clang++)
#PKG_LIBS=-Wl,-strip-debug
#endif

2 changes: 1 addition & 1 deletion src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PKG_CPPFLAGS=-DRCOMPILE
CXX_STD = CXX11
CXX_STD=CXX11


0 comments on commit 592a191

Please sign in to comment.