diff --git a/DESCRIPTION b/DESCRIPTION index 2eaa2d7421d4d57953b5ce9280296c9ff4d0198b..6a92cf5c49ecfa6c9fb245a149adee2cb47027b3 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.3.0 -Date: 2020-08-07 +Version: 1.3.1 +Date: 2021-10-28 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: 2020-08-07 10:38:00 UTC; mayo +Packaged: 2021-10-28 08:25: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: 2020-08-07 11:38:00 +Date/Publication: 2021-10-28 10:25:00 diff --git a/configure b/configure index 5f1591481d262cbadd53542c29a986f47b2ec12a..5bce9319113e28b55e11465a62b94b1bd828ab0e 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.3.0. +# Generated by GNU Autoconf 2.69 for clpAPI 1.3.1. # # 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.3.0' -PACKAGE_STRING='clpAPI 1.3.0' +PACKAGE_VERSION='1.3.1' +PACKAGE_STRING='clpAPI 1.3.1' 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.3.0 to adapt to many kinds of systems. +\`configure' configures clpAPI 1.3.1 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.3.0:";; + short | recursive ) echo "Configuration of clpAPI 1.3.1:";; 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.3.0 +clpAPI configure 1.3.1 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.3.0, which was +It was created by clpAPI $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4251,7 +4251,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.3.0, which was +This file was extended by clpAPI $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4313,7 +4313,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.3.0 +clpAPI config.status 1.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b459b47be593de8da1a247e8bdc6e1126582d731..81a5d908a0ad597391327a9d65f0f353120ddc7d 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([clpAPI], [1.3.0], [mayo.roettger@hhu.de]) +AC_INIT([clpAPI],[1.3.1],[mayo.roettger@hhu.de]) dnl # -------------------------------------------------------------------- dnl # template config.h.in @@ -56,16 +56,14 @@ dnl # get arguments dnl # -------------------------------------------------------------------- AC_ARG_WITH(clp-include, - AC_HELP_STRING([--with-clp-include=PATH], - [location of COIN-OR Clp include directory [[/usr/local/include]]] - ), + AS_HELP_STRING([--with-clp-include=PATH],[location of COIN-OR Clp include directory [[/usr/local/include]] + ]), [CLP_INCLUDE=$withval], [CLP_INCLUDE=""]) AC_ARG_WITH(clp-lib, - AC_HELP_STRING([--with-clp-lib=PATH], - [location of COIN-OR Clp callable library [[usr/local/lib]]] - ), + AS_HELP_STRING([--with-clp-lib=PATH],[location of COIN-OR Clp callable library [[usr/local/lib]] + ]), [CLP_LIB=$withval], [CLP_LIB=""]) @@ -284,6 +282,7 @@ dnl # -------------------------------------------------------------------- AC_SUBST(PKG_CFLAGS) AC_SUBST(PKG_LIBS) AC_SUBST(PKG_CPPFLAGS) -AC_OUTPUT(src/Makevars) +AC_CONFIG_FILES([src/Makevars]) +AC_OUTPUT exit 0 diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index a9cf18350fc4785bcabb59548113cae322d1e014..ec9a31f6faf7b93a53a08e8aa04ee5719f5e33a5 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.3.1 2021-10-28}{ + \itemize{ + \item Fix for CRAN issue concerning deprecated autoconf macros. + } +} + % ---------------------------------------------------------------------------- % \section{Changes in version 1.3.0 2020-08-07}{ \itemize{ diff --git a/src/clpAPI.c b/src/clpAPI.c index 53aa60663b1fdbc3c0ac2797e2dd43fba58297df..3dee735159c31c33d5d7b01279d1182c664ecdce 100755 --- a/src/clpAPI.c +++ b/src/clpAPI.c @@ -268,7 +268,7 @@ SEXP getMaximumSeconds(SEXP lp) { } /* -------------------------------------------------------------------------- */ -/* get if maximum iteration bound was hit*/ +/* get if maximum iteration (or time) bound was hit*/ SEXP getHitMaximumIterations(SEXP lp) { SEXP out = R_NilValue; diff --git a/src/config.h b/src/config.h old mode 100644 new mode 100755