diff --git a/ChangeLog b/ChangeLog index 20e3290..3fd8d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-01-03: Ver 0.3-0 + * Remove "zmq_utils.h" because #pragma diagnostics is not needed at all. + +2017-12-30: Ver 0.3-0 + * Fix windows conf spacing problems. + * Adjust contributions in DESCRIPTION. + 2017-12-29: Ver 0.3-0 * A better script for osx is made: overwrite both pbdZMQ.so and libzmq.*.dylib. * Remove some initial scripts needed by osx. diff --git a/DESCRIPTION b/DESCRIPTION index 74f7cf1..46ae928 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: pbdZMQ Version: 0.3-0 -Date: 2017-12-26 +Date: 2017-12-30 Title: Programming with Big Data -- Interface to ZeroMQ Authors@R: c(person("Wei-Chen", "Chen", role = c("aut", "cre"), email = "wccsnow@gmail.com"), @@ -13,7 +13,10 @@ Authors@R: c(person("Wei-Chen", "Chen", role = c("aut", "cre"), email = comment = "C code of shellexec, and Solaris"), person("R Core team", role = "ctb", comment = "some functions are modified from the R source code"), - person("Philipp", "A.", role = "ctb", comment = "Fedora")) + person("Philipp", "A.", role = "ctb", comment = "Fedora"), + person("Elliott Sales", "de Andrade", role = "ctb", comment = "sprintf"), + person("Spencer", "Aiello", role = "ctb", comment = "windows conf") + ) Depends: R (>= 3.2.0) LazyLoad: yes LazyData: yes diff --git a/R/get_conf_zmq.r b/R/get_conf_zmq.r index d81bdaf..3e899ad 100644 --- a/R/get_conf_zmq.r +++ b/R/get_conf_zmq.r @@ -46,7 +46,7 @@ get.zmq.ldflags <- function(arch = '', package = "pbdZMQ"){ file.name <- paste("./libs", arch, "/", sep = "") dir.path <- tools::file_path_as_absolute( system.file(file.name, package = package)) - zmq.ldflags <- paste("-L", dir.path, " -lzmq", sep = "") + zmq.ldflags <- paste("-L\"", dir.path, "\" -lzmq", sep = "") } else{ ### For non windows system. file.name <- paste("./etc", arch, "/Makeconf", sep = "") @@ -97,7 +97,7 @@ get.zmq.cppflags <- function(arch = '', package = "pbdZMQ"){ file.name <- paste("./zmq", arch, "/include", sep = "") dir.path <- tools::file_path_as_absolute( system.file(file.name, package = package)) - zmq.cppflags <- paste("-I", dir.path, sep = "") + zmq.cppflags <- paste("-I\"", dir.path, "\"", sep = "") } else{ ### For non windows system. file.name <- paste("./etc", arch, "/Makeconf", sep = "") diff --git a/README.md b/README.md index c124798..c7801ab 100644 --- a/README.md +++ b/README.md @@ -109,5 +109,7 @@ With additional contributions from: * Whit Armstrong (some functions are modified from rzmq for backwards compatibility) * Brian Ripley (C code of shellexec) * The R Core team (some functions are modified from the R source code) +* Elliott Sales de Andrade (sprintf version underflow) +* Spencer Aiello (windows conf spacing) For the distribution of ZeroMQ that is shipped with pbdZMQ, you can find details of authorship and copyright in `inst/zmq_copyright/` of the pbdZMQ source tree, or under `zmq_copyright/` of a binary installation of pbdZMQ. diff --git a/src/zmqsrc/include/zmq_utils.h b/src/zmqsrc/include/zmq_utils.h deleted file mode 100644 index f29638d..0000000 --- a/src/zmqsrc/include/zmq_utils.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file - - This file is part of libzmq, the ZeroMQ core engine in C++. - - libzmq is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License (LGPL) as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - As a special exception, the Contributors give you permission to link - this library with independent modules to produce an executable, - regardless of the license terms of these independent modules, and to - copy and distribute the resulting executable under terms of your choice, - provided that you also meet, for each linked independent module, the - terms and conditions of the license of that module. An independent - module is a module which is not derived from or based on this library. - If you modify this library, you must extend this exception to your - version of the library. - - libzmq is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . -*/ - -/* This file is deprecated, and all its functionality provided by zmq.h */ -/* Note that -Wpedantic compilation requires GCC to avoid using its custom - extensions such as #warning, hence the trick below. Also, pragmas for - warnings or other messages are not standard, not portable, and not all - compilers even have an equivalent concept. - So in the worst case, this include file is treated as silently empty. */ - -#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) || defined(_MSC_VER) -#if defined(__GNUC__) || defined(__GNUG__) -#pragma GCC diagnostic push -#pragma GCC diagnostic warning "-Wcpp" -#pragma GCC diagnostic ignored "-Werror" -#pragma GCC diagnostic ignored "-Wall" -#endif -#pragma message("Warning: zmq_utils.h is deprecated. All its functionality is provided by zmq.h.") -#if defined(__GNUC__) || defined(__GNUG__) -#pragma GCC diagnostic pop -#endif -#endif