jl4rb 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7cae52ad265d312103b5315bfd6280f2eba84b7745890046d0b5fcd2ae839f
-  data.tar.gz: 60e322b9e4f36c971156a754750b9b0de176a71556f437e4c2d28fbb30d51108
+  metadata.gz: b8b8aade7e2cc0fc2991e6352b94f47a56c7683f818373036afe32b83bb52e28
+  data.tar.gz: 781b45f9522acb27f4422e7f6f1cc6879dda966b7f5fee0cd505d21891fd0e2a
 SHA512:
-  metadata.gz: aa638b61bf3d4cb80caa430299c7add73f039b55e93c8ebd55bb4d00de4dfdf71bda3b3d08e20b971ba71bb7e7d0958bdb4266ed23b171071ef685f6342e6697
-  data.tar.gz: 77cc18725d48204aafcd6fea6b8a0b460c5f8e74eb0de206b2e659bcf4f936b6e1a91e98b5ba87e5cc10bc980a3bc54bd426b976cb6093a03b76b7bb4f4f206f
+  metadata.gz: daabc722567025b44d986a6f033b1de3ccd31dc16059b889b987eb6fa272d752a6b258eccbb5ce484110e06c2692522c7a7a6c68950da7590eed0bc49dd349e2
+  data.tar.gz: a4e322987a2d7f31c9bbb29353aecd0d5acdcda4ceaf11c7170b2aee892f3ec8e39d0265d93ffe345bd047d7c4cc754d3125cdfe43d71b880e401f8bf524314f

data/ext/jl4rb/extconf.rb

@@ -15,19 +15,21 @@ end
 def jl4rb_makefile(incs,libs)
 
     jl_share=`julia -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR, "julia"))'`
-    $CFLAGS     =`julia #{jl_share}/julia-config.jl --cflags`.strip
+    $CFLAGS     =`julia #{jl_share}/julia-config.jl --cflags`.strip + " -fdeclspec"
     $LDFLAGS    =`julia #{jl_share}/julia-config.jl --ldflags`.strip
-    $libs    =`julia #{jl_share}/julia-config.jl --ldlibs`.strip
+    $LIBS    = `julia #{jl_share}/julia-config.jl --ldlibs`.strip
 
+    puts [$CFLAGS, $LDFLAGS, $LIBS]
 
     header = nil
 
-    rb4r_name="jl4rb"
-    $objs = [rb4r_name+".o"]
+    jl4r_name="jl4rb"
+    $objs = [jl4r_name+".o"]
 
-    dir_config("R4rb")
-    p ( {:CFLAGS => $CFLAGS, :LDFLAGS => $LDFLAGS, :libs => $libs })
-    create_makefile(rb4r_name)
+    dir_config("jl4rb")
+    # 
+    p ( {:CFLAGS => $CFLAGS, :LDFLAGS => $LDFLAGS, :LIBS => $LIBS })
+    create_makefile(jl4r_name)
 end
-
+#p [$prefix_include,$prefix_lib]
 jl4rb_makefile($prefix_include,$prefix_lib)

data/ext/jl4rb/jl4rb.c

@@ -4,7 +4,6 @@
 
 **********************************************************************/
 
-#include "julia.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -17,23 +16,28 @@
 //#endif
 
 //-| next macros already exist in ruby and are undefined here
-//#undef T_FLOAT
 #undef NORETURN
 #include "ruby.h"
 #include "ruby/version.h"
+#undef T_FLOAT
+#undef NOINLINE
+#include "julia.h"
 
 #define length(a) jl_array_size(a,0)
 
 /************* INIT *********************/
 
 
-VALUE Julia_init()
+VALUE Julia_init(VALUE obj)
 {
-  jl_init();
+  //jl_init();
+  printf("%s %s\n", jl_get_libdir(), jl_get_default_sysimg_path());
+  jl_init(); //_with_image("/Applications/Julia-1.6.app/Contents/Resources/julia/bin", "../lib/sys.dylib");
+  printf("ok\n");
   return Qtrue;
 }
 
-VALUE Julia_exit(VALUE exitcode) {
+VALUE Julia_exit(VALUE obj, VALUE exitcode) {
   jl_atexit_hook(exitcode);
   return Qtrue;
 }
@@ -506,7 +510,7 @@ Init_jl4rb()
   mJulia = rb_define_module("Julia");
 
   rb_define_module_function(mJulia, "initJL", Julia_init, 0);
-
+ 
   rb_define_module_function(mJulia, "exitJL", Julia_exit, 1);
 
   rb_define_module_function(mJulia, "evalLine", Julia_eval, 2);

data/jl4rb.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 
 PKG_NAME='jl4rb'
-PKG_VERSION='0.2.3'
+PKG_VERSION='0.2.5'
 PKG_FILES=FileList[
     'Rakefile','jl4rb.gemspec',
     'ext/jl4rb/*.c',

data/lib/jl4rb.rb

@@ -1,6 +1,7 @@
 require 'jl4rb.bundle' if File.exists? File.join(File.dirname(__FILE__),'jl4rb.bundle') 
 require 'jl4rb.so' if File.exists? File.join(File.dirname(__FILE__),'jl4rb.so')
 
+p [:dl, "jl4rb.DLL loaded" ]
 # loading ruby files
 require 'jl4rb/jl2rb_init'
 require 'jl4rb/jl2rb_eval'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jl4rb
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - CQLS
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies: []
 description: 'R is embedded in ruby with some communication support .
 
@@ -35,7 +35,7 @@ licenses:
 - MIT
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,8 +52,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Julia for ruby
 test_files: []