Merge pull request #19 from dcdillon/bugfix/plugin-and-stripper

Fixing plugin bugs as well as simplifying stripper

Author: dcdillon

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcppHoney
 Type: Package
 Title: Iterator Based Expression Template Expansion of Standard Operators
-Version: 0.1.2
+Version: 0.1.2.1
 Author: Daniel C. Dillon
 Maintainer: Daniel C. Dillon <dcdillon@gmail.com>
 URL: https://github.com/dcdillon/RcppHoney

R/plugin.R

@@ -1,14 +1,41 @@
 .getLibs <- function() {
     linker_pattern <- "gcc|clang|g\\+\\+"
 
-    shlib_ld <- system("R CMD config SHLIB_LD", intern=TRUE)
-    shlib_cxxld <- system("R CMD config SHLIB_CXXLD", intern=TRUE)
+    shlib_ld <- system(paste0(file.path(R.home("bin"), "R"),
+        " CMD config SHLIB_LD"), intern=TRUE)
+    shlib_cxxld <- system(paste0(file.path(R.home("bin"), "R"),
+        " CMD config SHLIB_CXXLD"), intern=TRUE)
 
-    shlib_ld_results <- system(paste0(shlib_ld, " --version"), intern=TRUE)
-    shlib_cxxld_results <- system(paste0(shlib_cxxld, " --version"), intern=TRUE)
-
-    shlib_ld_good <- any(grepl(linker_pattern, shlib_ld_results))
-    shlib_cxxld_good <- any(grepl(linker_pattern, shlib_cxxld_results))
+    shlib_ld_good <- FALSE
+    shlib_cxxld_good <- FALSE
+    
+    if (shlib_ld != "") {
+        shlib_ld_good <- tryCatch({
+            shlib_ld_results <- system(paste0(shlib_ld, " --version"), intern=TRUE)
+            shlib_ld_good <- any(grepl(linker_pattern, shlib_ld_results))
+            shlib_ld_good
+        }, warning = function(w) {
+            return(FALSE)
+        }, error = function(e) {
+            return(FALSE)
+        })
+    } else {
+        shlib_ld_good <- TRUE
+    }
+    
+    if (shlib_cxxld != "") {
+        shlib_cxxld_good <- tryCatch({
+            shlib_cxxld_results <- system(paste0(shlib_ld, " --version"), intern=TRUE)
+            shlib_cxxld_good <- any(grepl(linker_pattern, shlib_ld_results))
+            shlib_cxxld_good
+        }, warning = function(w) {
+            return(FALSE)
+        }, error = function(e) {
+            return(FALSE)
+        })
+    } else {
+        shlib_cxxld_good <- TRUE
+    }
 
     libs <- if (shlib_ld_good && shlib_cxxld_good) "-Wl,-S" else ""
 

inst/tools/stripper

@@ -95,23 +95,6 @@ if [ $SHLIB_LD_RESULTS -eq 1 ] && [ $SHLIB_CXXLD_RESULTS -eq 1 ]; then
         echo "PKG_LIBS = \$(R_STRIP_LINKER_OPTION)" \
             >> src/Makevars.R_STRIP_LINKER_OPTION
     fi
-else
-    # We don't have a linker that we can tell to strip the debugging symbols
-    # so simply remove any previous assignment to R_STRIP_LINKER_OPTION.
-    # When we're done we'll add a line defining it as empty string (in case
-    # there are references to it elsewhere)
-    
-    if [ -f src/Makevars ]; then
-        while read -r LINE || [ -n "$LINE" ]; do
-            case "$LINE" in
-                *PKG_LIBS*=*R_STRIP_LINKER_OPTION*)
-                    LINE=${LINE% \$(R_STRIP_LINKER_OPTION)}
-                    echo $LINE >> src/Makevars.R_STRIP_LINKER_OPTION ;;
-                *R_STRIP_LINKER_OPTION=*) ;;
-                *) echo $LINE >> src/Makevars.R_STRIP_LINKER_OPTION ;;
-            esac
-        done <src/Makevars
-    fi
 fi
 
 # If we created a src/Makevars.R_STRIP_LINKER_OPTION file, then backup the

vignettes/functions.Rmd

@@ -4,7 +4,7 @@ author: Daniel C. Dillon
 date: "`r Sys.Date()`"
 output: html_document
 vignette: >
-  %\VignetteIndexEntry{RcppHoney Introduction}
+  %\VignetteIndexEntry{RcppHoney - Custom Functions}
   %\VignetteEngine{knitr::rmarkdown}
   %\VignetteEncoding{UTF-8}
 ---