Merge pull request #14 from snoweye/master

0.3-0 on CRAN

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.

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 =
         "[email protected]"),
@@ -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

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 = "")

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.