[chronojump] trying to fix RDotNet Windows



commit 42be171d8a7b12301fed9baf559757b4e0cc249f
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sat Feb 8 20:41:00 2014 +0100

    trying to fix RDotNet Windows

 rdotnet/RDotNet.NativeLibrary/UnmanagedDll.cs |    2 ++
 win32/deps/bin/{i386 => }/R.dll               |  Bin 3491840 -> 3491840 bytes
 win32/deps/bin/R.exe                          |  Bin 19456 -> 34816 bytes
 win32/deps/bin/{i386 => }/RSetReg.exe         |  Bin 20480 -> 20480 bytes
 win32/deps/bin/{i386 => }/Rblas.dll           |  Bin 238241 -> 238241 bytes
 win32/deps/bin/{i386 => }/Rcmd.exe            |  Bin 34304 -> 34304 bytes
 win32/deps/bin/{i386 => }/Rgraphapp.dll       |  Bin 348963 -> 348963 bytes
 win32/deps/bin/{i386 => }/Rgui.exe            |  Bin 17920 -> 17920 bytes
 win32/deps/bin/{i386 => }/Riconv.dll          |  Bin 102975 -> 102975 bytes
 win32/deps/bin/{i386 => }/Rlapack.dll         |  Bin 1914368 -> 1914368 bytes
 win32/deps/bin/Rscript.exe                    |  Bin 19456 -> 21504 bytes
 win32/deps/bin/{i386 => }/Rterm.exe           |  Bin 18432 -> 18432 bytes
 win32/deps/bin/{i386 => }/Rzlib.dll           |  Bin 154877 -> 154877 bytes
 win32/deps/bin/i386/R.exe                     |  Bin 34816 -> 0 bytes
 win32/deps/bin/i386/Rscript.exe               |  Bin 21504 -> 0 bytes
 win32/deps/bin/{i386 => }/open.exe            |  Bin 12800 -> 12800 bytes
 16 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/rdotnet/RDotNet.NativeLibrary/UnmanagedDll.cs b/rdotnet/RDotNet.NativeLibrary/UnmanagedDll.cs
index 7ddc115..9cca9f3 100644
--- a/rdotnet/RDotNet.NativeLibrary/UnmanagedDll.cs
+++ b/rdotnet/RDotNet.NativeLibrary/UnmanagedDll.cs
@@ -176,8 +176,10 @@ namespace RDotNet.NativeLibrary
                        {
                                return dlopen(filename, RTLD_LAZY);
                        }
+                       Console.WriteLine (filename); 
                        var searchPaths = (Environment.GetEnvironmentVariable("PATH") ?? 
"").Split(Path.PathSeparator);
                        var dll = searchPaths.Select(directory => Path.Combine(directory, 
filename)).FirstOrDefault(File.Exists);
+                       Console.WriteLine (dll); 
                        return dll == null ? IntPtr.Zero : dlopen(dll, RTLD_LAZY);
                }
                
diff --git a/win32/deps/bin/R.exe b/win32/deps/bin/R.exe
index 43731fa..6697c70 100644
Binary files a/win32/deps/bin/R.exe and b/win32/deps/bin/R.exe differ
diff --git a/win32/deps/bin/Rscript.exe b/win32/deps/bin/Rscript.exe
index 43731fa..fd03c0a 100644
Binary files a/win32/deps/bin/Rscript.exe and b/win32/deps/bin/Rscript.exe differ


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]