multiarray 0.11.0 → 0.11.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'multiarray'
-PKG_VERSION = '0.11.0'
+PKG_VERSION = '0.11.2'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]

data/lib/multiarray/gcccontext.rb

@@ -19,13 +19,18 @@ module Hornetseye
   
   class GCCContext
 
-    LDSHARED = Config::CONFIG[ 'LDSHARED' ] # c:\mingw\bin\gcc
-    STRIP = Config::CONFIG[ 'STRIP' ]
-    RUBYHDRDIR = Config::CONFIG.member?( 'rubyhdrdir' ) ?
-      "-I#{Config::CONFIG['rubyhdrdir']} " +
-      "-I#{Config::CONFIG['rubyhdrdir']}/#{Config::CONFIG['arch']}" :
-      "-I#{Config::CONFIG['archdir']}"
-    LIBRUBYARG = Config::CONFIG[ 'LIBRUBYARG' ]
+    CFG = RbConfig::CONFIG
+    if CFG[ 'rubyhdrdir' ]
+      CFLAGS = "-DNDEBUG #{CFG[ 'CFLAGS' ]} " +
+        "-I#{CFG['rubyhdrdir']} -I#{CFG['rubyhdrdir']}/#{CFG['arch']}"
+    else
+      CFLAGS = "-DNDEBUG #{CFG[ 'CFLAGS' ]} " +
+        "-I#{CFG['archdir']}"
+    end
+    LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} "
+                 "#{CFG[ 'SOLIBS' ]} #{CFG[ 'DLDLIBS' ]}"
+    LDSHARED = CFG[ 'LDSHARED' ]
+    DLEXT = CFG[ 'DLEXT' ]
     DIRNAME = "#{Dir.tmpdir}/hornetseye-ruby#{RUBY_VERSION}-" +
               "#{ENV[ 'USER' ] || ENV[ 'USERNAME' ]}"
     LOCKFILE = "#{DIRNAME}/lock"
@@ -38,8 +43,8 @@ module Hornetseye
     @@lib_name = 'hornetseye_aaaaaaaa'
 
     if ENV[ 'HORNETSEYE_PRELOAD_CACHE' ]
-      while File.exist? "#{DIRNAME}/#{@@lib_name}.so"
-        require "#{DIRNAME}/#{@@lib_name}.so"        
+      while File.exist? "#{DIRNAME}/#{@@lib_name}.#{DLEXT}"
+        require "#{DIRNAME}/#{@@lib_name}"        
         @@lib_name = @@lib_name.succ
       end
     end
@@ -128,14 +133,11 @@ EOS
       File.open "#{DIRNAME}/#{@lib_name}.c", 'w', 0600 do |f|
         f << template
       end
-      gcc = "#{LDSHARED} -fPIC #{RUBYHDRDIR} -O " +
-            "-o #{DIRNAME}/#{@lib_name}.so " +
+      gcc = "#{LDSHARED} #{CFLAGS} -o #{DIRNAME}/#{@lib_name}.#{DLEXT} " +
             "#{DIRNAME}/#{@lib_name}.c #{LIBRUBYARG}"
-      strip = "#{STRIP} #{DIRNAME}/#{@lib_name}.so"
       # puts template
       raise "Error compiling #{DIRNAME}/#{@lib_name}.c" unless system gcc
-      raise "Error stripping #{DIRNAME}/#{@lib_name}.so" unless system strip
-      require "#{DIRNAME}/#{@lib_name}.so"
+      require "#{DIRNAME}/#{@lib_name}"
     end
 
     def <<( str )

data/lib/multiarray/gcctype.rb

@@ -47,7 +47,7 @@ module Hornetseye
         'double'
       else
         if @typecode < Pointer_
-          'void *'
+          'unsigned char *'
         elsif @typecode < INDEX_
           'int'
         else

data/lib/multiarray/lookup.rb

@@ -30,9 +30,9 @@ module Hornetseye
     end
 
     def memory
-      if array_type.storage_size != @stride.get * typecode.storage_size
-        raise 'Memory is not contiguous'
-      end
+      #if array_type.storage_size != @stride.get * typecode.storage_size
+      #  raise 'Memory is not contiguous'
+      #end
       @p.memory
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +01:00
+date: 2010-10-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency