ffi 1.15.2-java → 1.15.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d83a2eea3ece55e5206d91feeba015ade7d7de9a08e2a370bdd224b54e3a01e
-  data.tar.gz: e80594cb4748e07c525b24c1ac3732d55b459732ac037f03c802e947134aabd2
+  metadata.gz: 676f149387269ce0baf987cb6101478492bb971910a93861cf3cdbed2ac978db
+  data.tar.gz: e4eea63d3de948f435d82eadd6a493d116aa745e540506cb7f2e26bce138bd0b
 SHA512:
-  metadata.gz: 66cd6f4984f41ecc4608ebe891b3a2de0f9667eb7cf65e35ed395cff03849c2e0b55fb06a88b682b12651209eb683760bdc0e70fec0f70589c3adbf8694975ea
-  data.tar.gz: fdd77cd447e3718c01809d259c4257f3fcb90eb534a84c9bf764d7871ffbd10b215eee5f23169e7afd7194228af47de9a341440e18df744c8cf3c1e01cbb06bf
+  metadata.gz: fff07a6b0a336cfca00b4f9bbcb06eee66fa693f0e4ebaa0fd4aa4dccc16c9f8ddb0fa833912071d395d187e4d6a41986d875768dfc2416cac79591ec69e49ff
+  data.tar.gz: 5d62fd612add81282ccf5d1ff06ffc6acffcd8f397cb198f0ab8bba3214ff0bb0f89edbb6e398654af7d4447e810b069117d1c352bc021fbf2b318555fb83b25

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+1.15.5 / 2022-01-10
+-------------------
+
+Fixed:
+* Fix long double argument or return values on 32bit i686. #849
+* FFI::ConstGenerator: avoid usage of the same binary file simultaneously. #929
+
+Added:
+* Add Windows fat binary gem for Ruby-3.1
+
+Removed:
+* Remove Windows fat binary gem for Ruby < 2.4
+
+
+1.15.4 / 2021-09-01
+-------------------
+
+Fixed:
+* Fix build for uClibc. #913
+* Correct module lookup when including `ffi-module` gem. #912
+
+Changed:
+* Use ruby code of the ffi gem in JRuby-9.2.20+. #915
+
+
+1.15.3 / 2021-06-16
+-------------------
+
+Fixed:
+* Fix temporary packaging issue with libffi. #904
+
+
 1.15.2 / 2021-06-16
 -------------------
 

data/Rakefile

@@ -18,7 +18,7 @@ RSpec::Core::RakeTask.new(:spec => :compile) do |config|
 end
 
 desc "Build all packages"
-task :package => %w[ gem:java gem:windows ]
+task :package => %w[ gem:java gem:native ]
 
 CLOBBER.include 'lib/ffi/types.conf'
 CLOBBER.include 'pkg'
@@ -86,7 +86,7 @@ task 'gem:java' => 'java:gem'
 
 FfiGemHelper.install_tasks
 # Register windows gems to be pushed to rubygems.org
-Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw32]
+Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32]
 
 if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   require 'rake/extensiontask'
@@ -108,11 +108,25 @@ else
 end
 
 
-desc "build a windows gem without all the ceremony"
-task "gem:windows" do
-  require "rake_compiler_dock"
-  sh "bundle package"
-  RakeCompilerDock.sh "sudo apt-get update && sudo apt-get install -y libltdl-dev && bundle --local && rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=${RUBY_CC_VERSION/:2.2.2/}"
+namespace "gem" do
+  task 'prepare' do
+    require 'rake_compiler_dock'
+    sh "bundle package --all"
+  end
+
+  Bundler::GemHelper.instance.cross_platforms.each do |plat|
+    desc "Build all native binary gems in parallel"
+    multitask 'native' => plat
+
+    desc "Build the native gem for #{plat}"
+    task plat => ['prepare', 'build'] do
+      RakeCompilerDock.sh <<-EOT, platform: plat
+        sudo apt-get update &&
+        sudo apt-get install -y libltdl-dev && bundle --local &&
+        rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=${RUBY_CC_VERSION/:2.2.2/}
+      EOT
+    end
+  end
 end
 
 directory "ext/ffi_c/libffi"

data/ffi.gemspec

@@ -39,5 +39,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake-compiler', '~> 1.0'
   s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 2.14.1'
-  s.add_development_dependency 'rubygems-tasks', "~> 0.2.4"
 end

data/lib/ffi/library.rb

@@ -84,7 +84,7 @@ module FFI
     # @raise {RuntimeError} if +mod+ is not a Module
     # Test if extended object is a Module. If not, raise RuntimeError.
     def self.extended(mod)
-      raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(Module)
+      raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(::Module)
     end
 
 

data/lib/ffi/tools/const_generator.rb

@@ -105,9 +105,10 @@ module FFI
     # @return [nil]
     # @raise if a constant is missing and +:required+ was set to +true+ (see {#initialize})
     def calculate(options = {})
-      binary = File.join Dir.tmpdir, "rb_const_gen_bin_#{Process.pid}"
+      binary_path = nil
 
       Tempfile.open("#{@prefix}.const_generator") do |f|
+        binary_path = f.path + ".bin"
         @includes.each do |inc|
           f.puts "#include <#{inc}>"
         end
@@ -125,7 +126,7 @@ module FFI
         f.flush
 
         cc = ENV['CC'] || 'gcc'
-        output = `#{cc} #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
+        output = `#{cc} #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary_path} 2>&1`
 
         unless $?.success? then
           output = output.split("\n").map { |l| "\t#{l}" }.join "\n"
@@ -133,8 +134,8 @@ module FFI
         end
       end
 
-      output = `#{binary}`
-      File.unlink(binary + (FFI::Platform.windows? ? ".exe" : ""))
+      output = `#{binary_path}`
+      File.unlink(binary_path + (FFI::Platform.windows? ? ".exe" : ""))
       output.each_line do |line|
         line =~ /^(\S+)\s(.*)$/
         const = @constants[$1]

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.15.2'
+  VERSION = '1.15.5'
 end

data/lib/ffi.rb

@@ -7,7 +7,7 @@ if RUBY_ENGINE == 'ruby'
 
   require 'ffi/ffi'
 
-elsif RUBY_ENGINE == 'jruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [9, 3]) >= 0
+elsif RUBY_ENGINE == 'jruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [9, 2, 20]) >= 0
   JRuby::Util.load_ext("org.jruby.ext.ffi.FFIService")
   require 'ffi/ffi'
 

data/rakelib/ffi_gem_helper.rb

@@ -13,7 +13,7 @@ class FfiGemHelper < Bundler::GemHelper
       update_history
     end
 
-    task "release:rubygem_push" => ["gem:windows", "gem:java"]
+    task "release:rubygem_push" => ["gem:native", "gem:java"]
   end
 
   def hfile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.5
 platform: java
 authors:
 - Wayne Meissner
@@ -29,7 +29,7 @@ cert_chain:
   NEF/4atY64rruzkyfxGEcrFFOHJIkWnWQjRGaiZdgULxf7ira2gEFvV/ZtamqJWF
   c+I=
   -----END CERTIFICATE-----
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,20 +87,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
@@ -231,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Ruby FFI