Mac support (issue #2): look also for .dylib files when default .so f…

…iles don't exist
renozao · Sep 15, 2014 · ca8a4af · ca8a4af
1 parent 2c7dbcd
commit ca8a4af
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: RcppOctave
 Type: Package
 Title: Seamless Interface to Octave -- and Matlab
-Version: 0.14.3
+Version: 0.14.4
 Date: 2013-11-07
 Author: Renaud Gaujoux
 Maintainer: Renaud Gaujoux <renaud@tx.technion.ac.il>

diff --git a/NEWS b/NEWS
@@ -1,3 +1,10 @@
+********************
+Changes in 0.14.4
+********************
+FIXES
+    o Mac support: look also for .dylib files when default .so files don't exist
+    (issue #2) 
+
 ********************
 Changes in 0.14.3
 ********************

diff --git a/R/package.R b/R/package.R
@@ -134,7 +134,10 @@ NULL
     }
 
     .load_dep <- function( libdir = Octave.config[['libdir']] ){
-        dlibs <- file.path(libdir, paste0(Octave.config[['libs']], .Platform$dynlib.ext))
+        if( is.Mac() && !file.exists(dlibs <- file.path(libdir, paste0(Octave.config[['libs']], .Platform$dynlib.ext))) ){
+            # on Mac look for .dylib if default .so does not exist
+            dlibs <- file.path(libdir, paste0(Octave.config[['libs']], ".dylib"))
+        }
         sapply(dlibs, dyn.load)
     }
 

diff --git a/R/utils.R b/R/utils.R
@@ -160,3 +160,9 @@ system_call <- function(...){
     }else base::system(..., intern = TRUE)
 
 }
+
+is.Mac <- function(check.gui=FALSE){
+	is.mac <- (length(grep("darwin", R.version$platform)) > 0)
+	# return TRUE is running on Mac (adn optionally through GUI)
+	is.mac && (!check.gui || .Platform$GUI == 'AQUA')
+}