From 32b6401c823cf789e7708adf9b1ec713daf7fe29 Mon Sep 17 00:00:00 2001 From: muschellij2 Date: Fri, 15 Nov 2019 17:25:52 -0500 Subject: [PATCH 1/4] updated it all --- .gitignore | 4 ++++ .travis.yml | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 770836b..fb341f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ +.Rproj.user +.Rhistory +.RData +.Rhistory /inst/doxygen/ /revdep diff --git a/.travis.yml b/.travis.yml index 7c8d9e6..01140ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,15 @@ language: r sudo: false cache: packages +os: + - linux + - osx + install: - Rscript -e 'install.packages(c("Rcpp","testthat","covr","tractor.base","oro.nifti"))' -script: +after_script: - R CMD build . -- R CMD check *tar.gz - cd standalone && make clean && make CC="$(R CMD config CC)" CXX="$(R CMD config CXX)" && ./nii_info ../inst/extdata/example.nii.gz after_success: From 526f6f30f7ab8334814034822916a4a4dc8d7a72 Mon Sep 17 00:00:00 2001 From: muschellij2 Date: Thu, 21 Nov 2019 14:17:38 -0500 Subject: [PATCH 2/4] added CXX_STD = CXX11 as per https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Using-C_002b_002b11-code --- src/Makevars | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makevars b/src/Makevars index e2375e1..18909f1 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,3 +1,5 @@ +CXX_STD = CXX11 + PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -I../inst/include -Izlib OBJECTS_ZLIB = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o From ce5ede0cd2231f034574b1d1799b221ee829d35f Mon Sep 17 00:00:00 2001 From: muschellij2 Date: Thu, 21 Nov 2019 14:18:06 -0500 Subject: [PATCH 3/4] added SysReq as per https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Using-C_002b_002b11-code --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 75723c9..394606a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,6 +20,7 @@ Description: Provides very fast read and write access to images stored in the a C/C++ API that can be used by other packages. Not to be confused with 'RNiftyReg', which performs image registration. License: GPL-2 +SystemRequirements: C++11 URL: https://github.com/jonclayden/RNifti BugReports: https://github.com/jonclayden/RNifti/issues Encoding: UTF-8 From 5e6d9c090215d30adb8f2dd5b5ef501d8c4c900f Mon Sep 17 00:00:00 2001 From: muschellij2 Date: Thu, 21 Nov 2019 14:26:14 -0500 Subject: [PATCH 4/4] =?UTF-8?q?added=20oro.nifti,tractor.base=20as=20per?= =?UTF-8?q?=20Such=20packages=20cannot=20be=20required=20to=20check=20the?= =?UTF-8?q?=20package:=20any=20tests=20which=20use=20them=20must=20be=20co?= =?UTF-8?q?nditional=20on=20the=20presence=20of=20the=20package.=20(If=20y?= =?UTF-8?q?our=20tests=20use=20e.g.=20a=20dataset=20from=20another=20packa?= =?UTF-8?q?ge=20it=20should=20be=20in=20=E2=80=98Suggests=E2=80=99=20and?= =?UTF-8?q?=20not=20=E2=80=98Enhances=E2=80=99.)=20from=20https://cran.r-p?= =?UTF-8?q?roject.org/doc/manuals/r-release/R-exts.html#Package-Dependenci?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DESCRIPTION | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 394606a..8f5e6b7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,8 +11,13 @@ Authors@R: c(person("Jon","Clayden",role=c("cre","aut"),email="code@clayden.org" person("Jean-loup","Gailly",role="cph"), person("Mark","Adler",role="cph")) Imports: Rcpp (>= 0.11.0) -Suggests: testthat (>= 0.11.0), covr, reportr, shades -Enhances: oro.nifti, tractor.base +Suggests: + testthat (>= 0.11.0), + covr, + reportr, + shades, + oro.nifti, + tractor.base LinkingTo: Rcpp Description: Provides very fast read and write access to images stored in the NIfTI-1 and ANALYZE-7.5 formats, with seamless synchronisation between