ffi 1.4.1.dev → 1.5.0.pre1

data/Rakefile

@@ -122,8 +122,7 @@ desc "Clean all built files"
 task :distclean => :clobber do
   FileUtils.rm_rf('build')
   FileUtils.rm_rf(Dir["lib/**/ffi_c.#{RbConfig::CONFIG['DLEXT']}"])
-  FileUtils.rm_rf('lib/1.8')
-  FileUtils.rm_rf('lib/1.9')
+  FileUtils.rm_rf(Dir["lib/**/ffi_c.so"])
   FileUtils.rm_rf('lib/ffi/types.conf')
   FileUtils.rm_rf('conftest.dSYM')
   FileUtils.rm_rf('pkg')
@@ -165,7 +164,7 @@ task 'spec:specdoc' => TEST_DEPS
 task :default => :specs
 
 task 'gem:win32' do
-  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3'") || raise("win32 build failed!")
+  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0'") || raise("win32 build failed!")
 end
 
 
@@ -203,6 +202,14 @@ if USE_RAKE_COMPILER
     ext.cross_compile = true                                  # enable cross compilation (requires cross compile toolchain)
     ext.cross_platform = 'i386-mingw32'                       # forces the Windows platform instead of the default one
   end
+
+  task 'copy:ffi_c:i386-mingw32:1.9.3' do |t|
+    sh "i686-w64-mingw32-strip -S lib/1.9/ffi_c.so"
+  end
+  
+  task 'copy:ffi_c:i386-mingw32:2.0.0' do |t|
+    sh "i686-w64-mingw32-strip -S lib/2.0/ffi_c.so"
+  end
 end
 
 begin

data/ext/ffi_c/extconf.rb

@@ -7,8 +7,8 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   # recent versions of ruby add restrictive ansi and warning flags on a whim - kill them all
   $warnflags = ''
-  $CFLAGS.gsub!(/-ansi/, '')
-  $CFLAGS.gsub!(/-std=[^\s]+/, '')
+  $CFLAGS.gsub!(/[\s+]-ansi/, '')
+  $CFLAGS.gsub!(/[\s+]-std=[^\s]+/, '')
   # solaris needs -c99 for <stdbool.h>
   $CFLAGS << " -std=c99" if RbConfig::CONFIG['host_os'] =~ /solaris/
   

data/ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi'
-  s.version = '1.4.1.dev'
+  s.version = '1.5.0.pre1'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'

data/lib/ffi.rb

@@ -5,6 +5,8 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
       require '1.8/ffi_c'
     elsif RUBY_VERSION =~ /1.9/
       require '1.9/ffi_c'
+    elsif RUBY_VERSION =~ /2.0/
+      require '2.0/ffi_c'
     else
       require 'ffi_c'
     end

data/lib/ffi/platform/x86_64-freebsd/types.conf

@@ -82,6 +82,8 @@ rbx.platform.typedef.int32_t = int
 rbx.platform.typedef.uint32_t = uint
 rbx.platform.typedef.int64_t = long_long
 rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.uintptr_t = ulong
 rbx.platform.typedef.u_int8_t = uchar
 rbx.platform.typedef.u_int16_t = ushort
 rbx.platform.typedef.u_int32_t = uint

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: -1853901420
+  prerelease: 6
   segments: 
   - 1
-  - 4
+  - 5
+  - 0
+  - pre
   - 1
-  - dev
-  version: 1.4.1.dev
+  version: 1.5.0.pre1
 platform: ruby
 authors: 
 - Wayne Meissner
@@ -15,46 +17,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-05 00:00:00 +10:00
-default_executable: 
+date: 2013-03-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  name: rake
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 6
         - 0
         version: 0.6.0
   type: :development
+  name: rake-compiler
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  name: rspec
   version_requirements: *id003
 description: Ruby FFI library
 email: wmeissner@gmail.com
@@ -499,7 +506,6 @@ files:
 - libtest/StructTest.c
 - libtest/UnionTest.c
 - libtest/VariadicTest.c
-has_rdoc: true
 homepage: http://wiki.github.com/ffi/ffi
 licenses: 
 - LGPL-3
@@ -510,18 +516,22 @@ require_paths:
 - lib
 - ext/ffi_c
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -530,7 +540,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby FFI