From 89eb95027499fa8dda280b268dfffa425f13eae7 Mon Sep 17 00:00:00 2001 From: Mayo Roettger <mayo.roettger@hhu.de> Date: Thu, 13 Feb 2020 10:58:02 +0100 Subject: [PATCH] Quick fix for CRAN warning: R CMD config for CPP is deprecated --- DESCRIPTION | 8 ++++---- configure | 20 ++++++++++---------- configure.ac | 2 +- inst/NEWS.Rd | 7 +++++++ src/symbols.rds | Bin 1795 -> 1872 bytes 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 43a0529..d1d1160 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: clpAPI Type: Package Title: R Interface to C API of COIN-or Clp -Version: 1.2.11 -Date: 2019-06-14 +Version: 1.2.12 +Date: 2020-02-13 Authors@R: c(person("Mayo", "Roettger", role = "cre", email = "mayo.roettger@hhu.de"), person("Gabriel", "Gelius-Dietrich", role = c("aut"), email = "geliudie@uni-duesseldorf.de"), person(c("C.", "Jonathan"), "Fritzemeier", role = "ctb", email = "clausjonathan.fritzemeier@uni-duesseldorf.de")) @@ -13,9 +13,9 @@ SystemRequirements: COIN-OR Clp (>= 1.12.0) License: GPL-3 | file LICENSE LazyLoad: yes Collate: generics.R clp_ptrClass.R clp.R clpAPI.R zzz.R -Packaged: 2019-06-14 14:00:00 UTC; mayo +Packaged: 2020-02-13 09:00:00 UTC; mayo Author: Mayo Roettger [cre], Gabriel Gelius-Dietrich [aut], C. Jonathan Fritzemeier [ctb] Maintainer: Mayo Roettger <mayo.roettger@hhu.de> NeedsCompilation: yes Repository: CRAN -Date/Publication: 2019-06-14 14:00:00 +Date/Publication: 2020-02-13 10:00:00 diff --git a/configure b/configure index 2feec86..9f96268 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for clpAPI 1.2.10. +# Generated by GNU Autoconf 2.69 for clpAPI 1.2.11. # # Report bugs to <mayo.roettger@hhu.de>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='clpAPI' PACKAGE_TARNAME='clpapi' -PACKAGE_VERSION='1.2.10' -PACKAGE_STRING='clpAPI 1.2.10' +PACKAGE_VERSION='1.2.11' +PACKAGE_STRING='clpAPI 1.2.11' PACKAGE_BUGREPORT='mayo.roettger@hhu.de' PACKAGE_URL='' @@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures clpAPI 1.2.10 to adapt to many kinds of systems. +\`configure' configures clpAPI 1.2.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of clpAPI 1.2.10:";; + short | recursive ) echo "Configuration of clpAPI 1.2.11:";; esac cat <<\_ACEOF @@ -1392,7 +1392,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -clpAPI configure 1.2.10 +clpAPI configure 1.2.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1694,7 +1694,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by clpAPI $as_me 1.2.10, which was +It was created by clpAPI $as_me 1.2.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2059,7 +2059,7 @@ if test -z "${R_HOME}"; then fi CC=`"${R_HOME}/bin/R" CMD config CC` -CPP=`"${R_HOME}/bin/R" CMD config CPP` +#CPP=`"${R_HOME}/bin/R" CMD config CPP` CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` ac_ext=c @@ -4252,7 +4252,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by clpAPI $as_me 1.2.10, which was +This file was extended by clpAPI $as_me 1.2.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4314,7 +4314,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -clpAPI config.status 1.2.10 +clpAPI config.status 1.2.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index fdc5305..3c39d1e 100755 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ fi dnl # GNU R default settings CC=`"${R_HOME}/bin/R" CMD config CC` -CPP=`"${R_HOME}/bin/R" CMD config CPP` +#CPP=`"${R_HOME}/bin/R" CMD config CPP` CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` AC_PROG_CC diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index d0e4466..ac878c8 100755 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -3,6 +3,13 @@ \name{NEWS} \title{clpAPI News} \encoding{UTF-8} +% ---------------------------------------------------------------------------- % +\section{Changes in version 1.2.12 2020-02-13}{ + \itemize{ + \item Quick fix for CRAN issue: 'config' variable 'CPP' is deprecated. + } +} + % ---------------------------------------------------------------------------- % \section{Changes in version 1.2.11 2019-06-14}{ \itemize{ diff --git a/src/symbols.rds b/src/symbols.rds index 74ded543e88932db402abd777261159e9e53b5ef..63efcff60f9a0b315602bd76b01b3e8f084b55b6 100755 GIT binary patch literal 1872 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 C`m3Y> literal 1795 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 YUC(<r)Ta2q`MRI+dUs^(GZO{|0CFFDr2qf` -- GitLab