From ffe30b3ed8cb35989f8262444787bd0833f9129d Mon Sep 17 00:00:00 2001 From: gagolews Date: Thu, 6 Apr 2017 15:04:32 +0200 Subject: [PATCH] now requiring R >= 2.14 --- DESCRIPTION | 2 +- devel/docker/docker_run_fedora_latest_R-old.sh | 18 ++++++++---------- inst/AUTHORS | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e451cc3b8..23e039378 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,7 +18,7 @@ BugReports: http://github.com/gagolews/stringi/issues SystemRequirements: ICU4C (>= 50, optional) Type: Package Depends: - R (>= 2.13.1) + R (>= 2.14) Imports: tools, utils, diff --git a/devel/docker/docker_run_fedora_latest_R-old.sh b/devel/docker/docker_run_fedora_latest_R-old.sh index 00e524f1d..2a24c2246 100755 --- a/devel/docker/docker_run_fedora_latest_R-old.sh +++ b/devel/docker/docker_run_fedora_latest_R-old.sh @@ -1,21 +1,19 @@ #!/bin/sh docker run --rm -ti fedora:latest /bin/bash -c " -dnf install -y -q libicu-devel git tar wget gcc-c++ readline-devel gcc-gfortran texlive-latex gettext-devel && \ +dnf install -y -q libicu-devel git tar wget gcc-c++ readline-devel gcc-gfortran texlive-latex gettext-devel && \ cd /tmp && \ -wget https://cran.r-project.org/src/base/R-2/R-2.13.1.tar.gz && \ -tar -zxf R-2.13.1.tar.gz && \ -cd R-2.13.1 && \ +wget https://cran.r-project.org/src/base/R-2/R-2.14.0.tar.gz && \ +tar -zxf R-2.14.0.tar.gz && \ +cd R-2.14.0 && \ ./configure --disable-nls --with-x=no --with-readline=no --with-cairo=no --with-libpng=no --with-ICU=no --with-jpeglib=no --with-recommended-packages=no && \ make && \ make install && \ cd /tmp && \ GIT_SSL_NO_VERIFY=true git clone https://github.com/gagolews/stringi.git && \ R CMD build stringi && \ -R CMD INSTALL stringi_*.tar.gz --configure-args='--disable-icu-bundle' --preclean --no-html && \ -Rscript --vanilla -e 'install.packages(c(\"Rcpp\", \"stringr\", \"testthat\"), repos=\"http://cran.rstudio.com/\", quiet=TRUE)' && \ -LC_ALL='en_US.UTF-8' Rscript --vanilla -e 'setwd(\"stringi\"); source(\"devel/testthat/run_package_tests.R\")' \ -R CMD INSTALL stringi_*.tar.gz --configure-args='--disable-pkg-config' --preclean --no-html && \ -Rscript --vanilla -e 'install.packages(c(\"Rcpp\", \"stringr\", \"testthat\"), repos=\"http://cran.rstudio.com/\", quiet=TRUE)' && \ -LC_ALL='en_US.UTF-8' Rscript --vanilla -e 'setwd(\"stringi\"); source(\"devel/testthat/run_package_tests.R\")' \ +R CMD INSTALL stringi_*.tar.gz --configure-args='--disable-icu-bundle' --preclean --no-html && \ +Rscript --vanilla -e 'stringi::stri_info()' && \ +R CMD INSTALL stringi_*.tar.gz --configure-args='--disable-pkg-config' --preclean --no-html && \ +Rscript --vanilla -e 'stringi::stri_info()' \ " diff --git a/inst/AUTHORS b/inst/AUTHORS index 5e5acc38a..bb18a1e48 100644 --- a/inst/AUTHORS +++ b/inst/AUTHORS @@ -2,7 +2,7 @@ * Marek Gagolewski (gagolews at rexamine dot com) [aut,cre] * Bartek Tartanus [ctb] - +and others (see https://github.com/gagolews/stringi/graphs/contributors). ** ICU source code contributors **