ffi 1.7.0.dev → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e0e169711bac631dcc3627cd32335671f3e931
-  data.tar.gz: 204499b27f918bb2a373c565c01f3ebb65f77e8b
+  metadata.gz: 08d9e4bd775b810d8ca6541f51491d4cf12301b8
+  data.tar.gz: c641ccba1fcb08a552d8b9d27faeef47e254c287
 SHA512:
-  metadata.gz: 6503891a4924031002825708c8b02d04451defa6e958953c038e1e483d7491d2e12db7309d3fd83b75e2d239cc88cc17d101328714da11b4dd77d7a2117526bd
-  data.tar.gz: 9f8bdcf6cdd408fa7690b5c881e801818ed10f8805b38d711f490c3adafca9408a9a957cbe46fe2a70606bdbf718321be857e4db4a667728dc9c61b399c43841
+  metadata.gz: 58cbea900c076f8091b8b5146610a7e313faa73b131c2822d3fb78dab6c6f3aed0d68227921f36570c91875229eaa92eda067eac1d1fa9dd8a927277fb5b86d7
+  data.tar.gz: 12f5440b92613fbdd0a74f0865750f6edad8e1f95470dae0f1c506e9b696028faad1c7d420ffcefc3b8e8667877c5b852ada95534e125486513d1f9fb87ea33d

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rubygems/package_task'
+require 'rubygems/tasks'
 require 'rbconfig'
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
@@ -64,8 +65,6 @@ OS = case RbConfig::CONFIG['host_os'].downcase
     RbConfig::CONFIG['host_os'].downcase
   end
 
-CC = ENV['CC'] || RbConfig::CONFIG['CC'] || "gcc"
-
 GMAKE = system('which gmake >/dev/null') && 'gmake' || 'make'
 
 LIBTEST = "build/libtest.#{LIBEXT}"
@@ -76,12 +75,6 @@ def gem_spec
   @gem_spec ||= Gem::Specification.load('ffi.gemspec')
 end
 
-Gem::PackageTask.new(gem_spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
-  pkg.package_dir = 'pkg'
-end
-
 TEST_DEPS = [ LIBTEST ]
 if RUBY_PLATFORM == "java"
   desc "Run all specs"
@@ -109,25 +102,15 @@ end
 desc "Build all packages"
 task :package => 'gem:package'
 
-desc "Install the gem locally"
-task :install => 'gem:install'
 
-namespace :gem do
-  task :install => :gem do
-    ruby %{ -S gem install pkg/ffi-#{gem_spec.version}.gem }
-  end
-end
-
-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(Dir["lib/**/ffi_c.so"])
-  FileUtils.rm_rf('lib/ffi/types.conf')
-  FileUtils.rm_rf('conftest.dSYM')
-  FileUtils.rm_rf('pkg')
-end
+CLOBBER.include 'build'
+CLOBBER.include FileList['lib/**/ffi_c.so']
+CLOBBER.include FileList["lib/**/ffi_c.#{RbConfig::CONFIG['DLEXT']}"]
+CLOBBER.include 'lib/ffi/types.conf'
+CLOBBER.include 'conftest.dSYM'
+CLOBBER.include 'pkg'
 
+task :distclean => :clobber
 
 desc "Build the native test lib"
 file "build/libtest.#{LIBEXT}" => FileList['libtest/**/*.[ch]'] do
@@ -200,18 +183,30 @@ if USE_RAKE_COMPILER
     # ext.lib_dir = BUILD_DIR                                 # put binaries into this folder.
     ext.tmp_dir = BUILD_DIR                                   # temporary folder used during compilation.
     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
+    ext.cross_platform = %w[i386-mingw32 x64-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"
+  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+    task "copy:ffi_c:i386-mingw32:#{ruby_version}" do |t|
+      %w[lib #{BUILD_DIR}/i386-mingw32/stage/lib].each do |dir| 
+        if File.exists?("#{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
+          sh "i686-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
+        end
+      end
+    end
+
+    task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
+      if File.exists?("#{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
+        sh "x86_64-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
+      end
+    end
   end
 end
 
+Gem::Tasks.new do |t|
+  t.scm.tag.format = '%s'
+end
+
 begin
   require 'yard'
 

data/ffi.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'ffi'
-  s.version = '1.7.0.dev'
+  s.version = '1.7.0'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'
   s.summary = 'Ruby FFI'
   s.description = 'Ruby FFI library'
-  s.files = %w(ffi.gemspec History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /lib\/1\.[89]/}
+  s.files = %w(ffi.gemspec History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /lib\/[12]\.[089]/}
   s.extensions << 'ext/ffi_c/extconf.rb'
   s.has_rdoc = false
   s.rdoc_options = %w[--exclude=ext/ffi_c/.*\.o$ --exclude=ffi_c\.(bundle|so)$]
@@ -16,4 +16,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rake-compiler', '>=0.6.0'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubygems-tasks'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.7.0.dev
+  version: 1.7.0
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
@@ -514,9 +528,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.0