ffi 1.9.8-java → 1.9.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03429ad547c042f1087a3e494b8b8ad432e54982
-  data.tar.gz: 1c026018c06008e66f9f1804bb5645591fd3f03d
+  metadata.gz: 19eaf534f92ce38a356030667ced3593a05d31e0
+  data.tar.gz: 2170d42e04a32077b7b22f5413e085a53f84fd1a
 SHA512:
-  metadata.gz: 7ba5fb71868f4425dfeb09709d916e45258d2a2be50e10bba4b443769d45837d9f0789a4057aafd6a2ab2bfc10a478341bbf8c9586e1e9374724001b6320a860
-  data.tar.gz: 7a4f60d738ced8316466f86899cea5812d77ffd46324ef999161fa3f137bf24f7df24e1d1c32042fde505bdfceff145943debf3a4abc87c89c228aa277159d87
+  metadata.gz: f281736e6412e2be7717e1cf094ba6406a115dfa7ef982756b59327fe27d49840cffb9926cbcc0a9e208aeae4d58f11b9450031337d8267219585d4fe65f3184
+  data.tar.gz: b4b597dc8c3892d338bae3999942e9daafe84d80b58cd19e4c60e0cab81b6bb08096694c55f49d394a3f9f9439f0e49e224c9a1daccb608c996b3e0a84959ff1

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems/tasks'
 require 'rbconfig'
 require 'rake/clean'
+require File.expand_path("./lib/ffi/version")
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
@@ -13,11 +14,6 @@ require 'rbconfig'
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 
-RSpec::Core::RakeTask.new(:spec => :compile) do |config|
-  config.rspec_opts = YAML.load_file 'spec/spec.opts'
-end
-
-
 LIBEXT = case RbConfig::CONFIG['host_os'].downcase
   when /darwin/
     "dylib"
@@ -81,38 +77,31 @@ end
 
 TEST_DEPS = [ LIBTEST ]
 if RUBY_PLATFORM == "java"
-  desc "Run all specs"
-  task :specs, [:options] => TEST_DEPS do |t, args|
-    sh %{#{Gem.ruby} -w -S rspec #{args.options || Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
-  end
-  desc "Run rubinius specs"
-  task :rbxspecs => TEST_DEPS do
-    sh %{#{Gem.ruby} -w -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
+  RSpec::Core::RakeTask.new(:spec) do |config|
+    config.rspec_opts = YAML.load_file 'spec/spec.opts'
   end
 else
-  TEST_DEPS.unshift :compile
-  desc "Run all specs"
-  task :specs, [:options] => TEST_DEPS do |t, args|
-    ENV["MRI_FFI"] = "1"
-    sh %{#{Gem.ruby} -w -Ilib -I#{BUILD_EXT_DIR} -S rspec #{args.options || Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
-  end
-  desc "Run rubinius specs"
-  task :rbxspecs => TEST_DEPS do
-    ENV["MRI_FFI"] = "1"
-    sh %{#{Gem.ruby} -w -Ilib -I#{BUILD_EXT_DIR} -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
+  RSpec::Core::RakeTask.new(:spec => :compile) do |config|
+    config.rspec_opts = YAML.load_file 'spec/spec.opts'
   end
+
+  TEST_DEPS.unshift :compile
 end
 
 desc "Build all packages"
 task :package => 'gem:package'
 
-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'
-CLOBBER.include 'spec/ffi/fixtures/libtest.dylib'
+
+CLEAN.include 'build'
+CLEAN.include 'conftest.dSYM'
+CLEAN.include 'spec/ffi/fixtures/libtest.dylib'
+CLEAN.include FileList["pkg/ffi-#{FFI::VERSION}-*-mingw32"]
+CLEAN.include FileList["pkg/ffi-#{FFI::VERSION}-java"]
+CLEAN.include FileList['lib/1.*']
+CLEAN.include FileList['lib/2.*']
+CLEAN.include 'bin'
 
 task :distclean => :clobber
 
@@ -185,27 +174,23 @@ if USE_RAKE_COMPILER
     ext.cross_platform = %w[i386-mingw32 x64-mingw32]                     # forces the Windows platform instead of the default one
   end
 
-  task 'gem:win32' => ['gem:win32-x64', 'gem:win32-i386']
-
-  task 'gem:win32-i386' do
-    sh("rake cross native:i386-mingw32 gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0:2.1.5:2.2.1'") || raise("win32-i386 build failed!")
-  end
-
-  task 'gem:win32-x64' do
-    sh("rake cross native:x64-mingw32 gem RUBY_CC_VERSION='2.0.0:2.1.5:2.2.1'") || raise("win32-x64 build failed!")
-  end
+  ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0:2.1.5:2.2.1'
 
-  (ENV['RUBY_CC_VERSION'] || '1.8.7:1.9.3:2.0.0:2.1.5:2.2.1' ).to_s.split(':').each do |ruby_version|
+  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
     task "copy:ffi_c:i386-mingw32:#{ruby_version}" do |t|
       sh "i686-w64-mingw32-strip -S #{BUILD_DIR}/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
     end
-  end
 
-  (ENV['RUBY_CC_VERSION'] || '2.0.0:2.1.5:2.2.1' ).to_s.split(':').each do |ruby_version|
     task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
       sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
     end
   end
+
+  desc "build a windows gem without all the ceremony."
+  task "gem:windows" do
+    require "rake_compiler_dock"
+    RakeCompilerDock.sh "bundle && rake cross native gem MAKE='nice make -j`nproc`'"
+  end
 end
 
 Gem::Tasks.new do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
 platform: java
 authors:
 - Wayne Meissner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies: []
 description: Ruby FFI library
 email: wmeissner@gmail.com
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: Ruby FFI