diff --git a/DESCRIPTION b/DESCRIPTION index 43a05296d40483d374ef47139b77c2913f388177..d1d1160c1a17f1aa64c2f209cefbf0309971b709 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 2feec862314bd3daf5fd6ffcd16eaebb40b65a3e..9f962684e94ec9bd8dfd9331c4ad1e65c40953fc 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 fdc53053a92e7446ba9ee90eae26521521b46f69..3c39d1e5467107360859f8d94e270bb55d7090ca 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 d0e4466bd4e4a4d4f8f1697d8d283095ff4c46dd..ac878c8db2c713e87a2aa0c6476a85576d6b7f22 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 Binary files a/src/symbols.rds and b/src/symbols.rds differ