ffi 1.14.0-x64-mingw32 → 1.15.2-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 614f2331a77eb45762c942a282697e247a86a4b2f97582226893e93cb496bee5
4
- data.tar.gz: 1c39548adec97f5c9b7f19518edcf1581583b3a55b11535edfdc7b67031f2a54
3
+ metadata.gz: bd094d6ef86e3a2c4d225410d399ce3e9ee81be1d34044a6396619cf898fbb7e
4
+ data.tar.gz: 39c2e44353615ca3ce39b4a1016efce1bffb1d6abd4b0f92d118ad38e1e26cda
5
5
  SHA512:
6
- metadata.gz: 62f122b39e7f8b78fb5e01e6acdbb67f9d0ae009145944b22af0cd1c474cdf0d4afe63c409d644418d66d3135269a979e435c78c3e4df4ec641160e72d6685aa
7
- data.tar.gz: 15f60935d1e76db78ef96d6e06de2dfcb2f3151b005083abe1b6fd180fbad3945544d1d344b582529d07401c14d22b7a15d0ad1a03f73592356fc7e6a4a8684b
6
+ metadata.gz: 94d9ae91aa177b253398818ab6586027dbd5c43f4ce6def756785cb84597261eca0ae06807e3b326adafb5371028362d2cd69561f9a43156e6e26b7f03a93230
7
+ data.tar.gz: bce0bc60b15c3afe7503576d0c05f42958cf8bcbd50700630f25b56b7ba590acad4fa9bfb9cc0b440639ae11410b6d43cbedabb94780d892a00912403fb064e3
data/CHANGELOG.md CHANGED
@@ -1,3 +1,61 @@
1
+ 1.15.2 / 2021-06-16
2
+ -------------------
3
+
4
+ Added:
5
+ * Add support for Windows MINGW-UCRT build. #903
6
+ * Add `/opt/homebrew/lib/` to fallback search paths to improve homebrew support. #880 #882
7
+
8
+ Changed:
9
+ * Regenerate `types.conf` for FreeBSD12 aarch64. #902
10
+
11
+
12
+ 1.15.1 / 2021-05-22
13
+ -------------------
14
+
15
+ Fixed:
16
+ * Append -pthread to linker options. #893
17
+ * Use arm or aarch64 to identify Apple ARM CPU arch. #899
18
+ * Allow overriding `gcc` with the `CC` env var in `const_generator.rb` and `struct_generator.rb`. #897
19
+
20
+
21
+ 1.15.0 / 2021-03-05
22
+ -------------------
23
+
24
+ Fixed:
25
+ * Fix MSVC build
26
+ * Fix async callbacks in conjunction with fork(). #884
27
+
28
+ Added:
29
+ * Allow to pass callbacks in varargs. #885
30
+ * Name the threads for FFI callback dispatcher and async thread calls for easier debugging. #883
31
+ The name can be retrieved by Thread.name and is shown by Thread.list.inspect etc.
32
+ Even gdb shows the thread name on supported operating systems.
33
+ * Add types.conf for powerpc64le-linux
34
+ * Add types.conf for riscv64-linux
35
+ * More release automation of ffi gems
36
+
37
+ Changed:
38
+ * Switch from rubygems-tasks to bundler/gem_helper
39
+
40
+ Removed:
41
+ * Remove unused VariadicInvoker#init
42
+
43
+
44
+ 1.14.2 / 2020-12-21
45
+ -------------------
46
+
47
+ Fixed:
48
+ * Fix builtin libffi on newer Ubuntu caused by an outdated Makefile.in . #863
49
+
50
+
51
+ 1.14.1 / 2020-12-19
52
+ -------------------
53
+
54
+ Changed:
55
+ * Revert changes to FFI::Pointer#write_string made in ffi-1.14.0.
56
+ It breaks compatibilty in a way that can cause hard to find errors. #857
57
+
58
+
1
59
  1.14.0 / 2020-12-18
2
60
  -------------------
3
61
 
@@ -21,6 +79,7 @@ Fixed:
21
79
  * Fix memory leak in MethodHandle . #815
22
80
  * Fix possible segfault in combination with fiddle or other libffi using gems . #835
23
81
  * Fix possibility to use ffi ruby gem with JRuby-9.3 . #763
82
+ * Fix a GC issue, when a callback Proc is used on more than 2 callback signatures. #820
24
83
 
25
84
 
26
85
  1.13.1 / 2020-06-09
data/Gemfile CHANGED
@@ -5,10 +5,7 @@ group :development do
5
5
  gem 'rake-compiler', '~> 1.0.3'
6
6
  gem 'rake-compiler-dock', '~> 1.0'
7
7
  gem 'rspec', '~> 3.0'
8
- # irb is a dependency of rubygems-tasks 0.2.5.
9
- # irb versions > 1.1.1 depend on reline,
10
- # which sometimes causes 'bundle install' to fail on Ruby <= 2.4: https://github.com/rubygems/rubygems/issues/3463
11
- gem 'rubygems-tasks', '>= 0.2', '< 0.2.5', :require => 'rubygems/tasks'
8
+ gem 'bundler', '>= 1.16', '< 3'
12
9
  end
13
10
 
14
11
  group :doc do
data/README.md CHANGED
@@ -62,6 +62,10 @@ On JRuby and TruffleRuby, there are no requirements to install the FFI gem, and
62
62
  From rubygems:
63
63
 
64
64
  [sudo] gem install ffi
65
+
66
+ From a Gemfile using git or GitHub
67
+
68
+ gem 'ffi', github: 'ffi/ffi', submodules: true
65
69
 
66
70
  or from the git repository on github:
67
71
 
data/Rakefile CHANGED
@@ -1,20 +1,17 @@
1
- require 'rubygems/tasks'
2
1
  require 'rbconfig'
3
- require 'rake/clean'
4
- require_relative "lib/ffi/version"
5
-
6
2
  require 'date'
7
3
  require 'fileutils'
8
4
  require 'rbconfig'
9
5
  require 'rspec/core/rake_task'
10
6
  require 'rubygems/package_task'
7
+ require 'rake/extensiontask'
8
+ require_relative "lib/ffi/version"
9
+ require_relative "rakelib/ffi_gem_helper"
11
10
 
12
11
  BUILD_DIR = "build"
13
12
  BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
14
13
 
15
- def gem_spec
16
- @gem_spec ||= Gem::Specification.load('ffi.gemspec')
17
- end
14
+ gem_spec = Bundler.load_gemspec('ffi.gemspec')
18
15
 
19
16
  RSpec::Core::RakeTask.new(:spec => :compile) do |config|
20
17
  config.rspec_opts = YAML.load_file 'spec/spec.opts'
@@ -37,6 +34,13 @@ CLEAN.include "pkg/ffi-*-{mingw32,java}"
37
34
  CLEAN.include 'lib/1.*'
38
35
  CLEAN.include 'lib/2.*'
39
36
 
37
+ # clean all shipped files, that are not in git
38
+ CLEAN.include(
39
+ gem_spec.files -
40
+ `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0").map { |f| File.join("ext/ffi_c/libffi", f) } -
41
+ `git ls-files -z`.split("\x0")
42
+ )
43
+
40
44
  task :distclean => :clobber
41
45
 
42
46
  desc "Test the extension"
@@ -80,6 +84,10 @@ end
80
84
 
81
85
  task 'gem:java' => 'java:gem'
82
86
 
87
+ FfiGemHelper.install_tasks
88
+ # Register windows gems to be pushed to rubygems.org
89
+ Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw32]
90
+
83
91
  if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
84
92
  require 'rake/extensiontask'
85
93
  Rake::ExtensionTask.new('ffi_c', gem_spec) do |ext|
@@ -87,21 +95,11 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
87
95
  # ext.lib_dir = BUILD_DIR # put binaries into this folder.
88
96
  ext.tmp_dir = BUILD_DIR # temporary folder used during compilation.
89
97
  ext.cross_compile = true # enable cross compilation (requires cross compile toolchain)
90
- ext.cross_platform = %w[i386-mingw32 x64-mingw32] # forces the Windows platform instead of the default one
98
+ ext.cross_platform = Bundler::GemHelper.instance.cross_platforms
91
99
  ext.cross_compiling do |spec|
92
100
  spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
93
101
  end
94
- end
95
102
 
96
- # To reduce the gem file size strip mingw32 dlls before packaging
97
- ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
98
- task "build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
99
- sh "i686-w64-mingw32-strip -S build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
100
- end
101
-
102
- task "build/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
103
- sh "x86_64-w64-mingw32-strip -S build/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
104
- end
105
103
  end
106
104
  else
107
105
  task :compile do
@@ -109,6 +107,7 @@ else
109
107
  end
110
108
  end
111
109
 
110
+
112
111
  desc "build a windows gem without all the ceremony"
113
112
  task "gem:windows" do
114
113
  require "rake_compiler_dock"
@@ -125,7 +124,7 @@ task :libffi => "ext/ffi_c/libffi/autogen.sh"
125
124
 
126
125
  LIBFFI_GIT_FILES = `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0")
127
126
 
128
- # Generate files in gemspec but not in libffi's git repo by running autogen.sh
127
+ # Generate files which are in the gemspec but not in libffi's git repo by running autogen.sh
129
128
  gem_spec.files.select do |f|
130
129
  f =~ /ext\/ffi_c\/libffi\/(.*)/ && !LIBFFI_GIT_FILES.include?($1)
131
130
  end.each do |f|
@@ -141,6 +140,11 @@ end.each do |f|
141
140
  end
142
141
  end
143
142
 
143
+ # Make sure we have all gemspec files before packaging
144
+ task :build => gem_spec.files
145
+ task :gem => :build
146
+
147
+
144
148
  require_relative "lib/ffi/platform"
145
149
  types_conf = File.expand_path(File.join(FFI::Platform::CONF_DIR, 'types.conf'))
146
150
  logfile = File.join(File.dirname(__FILE__), 'types_log')
@@ -161,10 +165,6 @@ end
161
165
  desc "Create or update type information for platform #{FFI::Platform::NAME}"
162
166
  task :types_conf => types_conf
163
167
 
164
- Gem::Tasks.new do |t|
165
- t.scm.tag.format = '%s'
166
- end
167
-
168
168
  begin
169
169
  require 'yard'
170
170
 
data/lib/2.3/ffi_c.so CHANGED
Binary file
data/lib/2.4/ffi_c.so CHANGED
Binary file
data/lib/2.5/ffi_c.so CHANGED
Binary file
data/lib/2.6/ffi_c.so CHANGED
Binary file
data/lib/2.7/ffi_c.so CHANGED
Binary file
data/lib/3.0/ffi_c.so ADDED
Binary file
data/lib/ffi.rb CHANGED
@@ -1,5 +1,4 @@
1
- if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
2
- Object.send(:remove_const, :FFI) if defined?(::FFI)
1
+ if RUBY_ENGINE == 'ruby'
3
2
  begin
4
3
  require RUBY_VERSION.split('.')[0, 2].join('.') + '/ffi_c'
5
4
  rescue Exception
@@ -117,7 +117,7 @@ module FFI
117
117
  end
118
118
 
119
119
  # @abstract Base class for {AutoPointer}'s releasers.
120
- #
120
+ #
121
121
  # All subclasses of Releaser should define a +#release(ptr)+ method.
122
122
  # A releaser is an object in charge of release an {AutoPointer}.
123
123
  class Releaser
data/lib/ffi/io.rb CHANGED
@@ -29,7 +29,7 @@
29
29
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#
30
30
 
31
31
  module FFI
32
-
32
+
33
33
  # This module implements a couple of class methods to play with IO.
34
34
  module IO
35
35
  # @param [Integer] fd file decriptor
@@ -42,12 +42,12 @@ module FFI
42
42
 
43
43
  # @param [#read] io io to read from
44
44
  # @param [AbstractMemory] buf destination for data read from +io+
45
- # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+,
45
+ # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+,
46
46
  # read until end of file.
47
47
  # @return [Numeric] length really read, in bytes
48
48
  #
49
49
  # A version of IO#read that reads data from an IO and put then into a native buffer.
50
- #
50
+ #
51
51
  # This will be optimized at some future time to eliminate the double copy.
52
52
  #
53
53
  def self.native_read(io, buf, len)
data/lib/ffi/library.rb CHANGED
@@ -126,7 +126,7 @@ module FFI
126
126
  else
127
127
  # TODO better library lookup logic
128
128
  unless libname.start_with?("/") || FFI::Platform.windows?
129
- path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/'].find do |pth|
129
+ path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/', '/opt/homebrew/lib/'].find do |pth|
130
130
  File.exist?(pth + libname)
131
131
  end
132
132
  if path
@@ -44,7 +44,7 @@ module FFI
44
44
  # attach_function :new_dlist, [], :pointer
45
45
  # attach_function :destroy_dlist, [:pointer], :void
46
46
  # end
47
- #
47
+ #
48
48
  # class DoublyLinkedList < FFI::ManagedStruct
49
49
  # @@@
50
50
  # struct do |s|
@@ -71,7 +71,7 @@ module FFI
71
71
 
72
72
  # @overload initialize(pointer)
73
73
  # @param [Pointer] pointer
74
- # Create a new ManagedStruct which will invoke the class method #release on
74
+ # Create a new ManagedStruct which will invoke the class method #release on
75
75
  # @overload initialize
76
76
  # A new instance of FFI::ManagedStruct.
77
77
  def initialize(pointer=nil)
data/lib/ffi/platform.rb CHANGED
@@ -132,11 +132,8 @@ module FFI
132
132
  end
133
133
 
134
134
  LIBC = if IS_WINDOWS
135
- if RbConfig::CONFIG['host_os'] =~ /mingw/i
136
- RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
137
- else
138
- "ucrtbase.dll"
139
- end
135
+ crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
136
+ "#{crtname}.dll"
140
137
  elsif IS_GNU
141
138
  GNU_LIBC
142
139
  elsif OS == 'cygwin'
@@ -39,9 +39,9 @@ rbx.platform.typedef.__segsz_t = int
39
39
  rbx.platform.typedef.__size_t = ulong
40
40
  rbx.platform.typedef.__socklen_t = uint
41
41
  rbx.platform.typedef.__ssize_t = long
42
- rbx.platform.typedef.__suseconds_t = int
42
+ rbx.platform.typedef.__suseconds_t = long
43
43
  rbx.platform.typedef.__swblk_t = int
44
- rbx.platform.typedef.__time_t = int
44
+ rbx.platform.typedef.__time_t = long
45
45
  rbx.platform.typedef.__timer_t = int
46
46
  rbx.platform.typedef.__uid_t = uint
47
47
  rbx.platform.typedef.__uint16_t = ushort
@@ -1,128 +1,181 @@
1
+ rbx.platform.typedef.*) = pointer
2
+ rbx.platform.typedef.___wchar_t = uint
3
+ rbx.platform.typedef.__accmode_t = int
4
+ rbx.platform.typedef.__blkcnt_t = long
5
+ rbx.platform.typedef.__blksize_t = int
6
+ rbx.platform.typedef.__char16_t = ushort
7
+ rbx.platform.typedef.__char32_t = uint
1
8
  rbx.platform.typedef.__clock_t = int
2
9
  rbx.platform.typedef.__clockid_t = int
3
- rbx.platform.typedef.__cpuid_t = ulong
4
- rbx.platform.typedef.__dev_t = ulong_long
5
- rbx.platform.typedef.__fd_mask = int
10
+ rbx.platform.typedef.__cpulevel_t = int
11
+ rbx.platform.typedef.__cpusetid_t = int
12
+ rbx.platform.typedef.__cpuwhich_t = int
13
+ rbx.platform.typedef.__critical_t = long
14
+ rbx.platform.typedef.__ct_rune_t = int
15
+ rbx.platform.typedef.__daddr_t = long
16
+ rbx.platform.typedef.__dev_t = ulong
17
+ rbx.platform.typedef.__fd_mask = ulong
18
+ rbx.platform.typedef.__fflags_t = uint
6
19
  rbx.platform.typedef.__fixpt_t = uint
20
+ rbx.platform.typedef.__fsblkcnt_t = ulong
21
+ rbx.platform.typedef.__fsfilcnt_t = ulong
7
22
  rbx.platform.typedef.__gid_t = uint
8
- rbx.platform.typedef.__id_t = uint
9
- rbx.platform.typedef.__in_addr_t = uint
10
- rbx.platform.typedef.__in_port_t = ushort
11
- rbx.platform.typedef.__ino_t = ulong_long
23
+ rbx.platform.typedef.__id_t = long
24
+ rbx.platform.typedef.__ino_t = ulong
12
25
  rbx.platform.typedef.__int16_t = short
13
26
  rbx.platform.typedef.__int32_t = int
14
- rbx.platform.typedef.__int64_t = long_long
27
+ rbx.platform.typedef.__int64_t = long
15
28
  rbx.platform.typedef.__int8_t = char
16
29
  rbx.platform.typedef.__int_fast16_t = int
17
30
  rbx.platform.typedef.__int_fast32_t = int
18
- rbx.platform.typedef.__int_fast64_t = long_long
31
+ rbx.platform.typedef.__int_fast64_t = long
19
32
  rbx.platform.typedef.__int_fast8_t = int
20
33
  rbx.platform.typedef.__int_least16_t = short
21
34
  rbx.platform.typedef.__int_least32_t = int
22
- rbx.platform.typedef.__int_least64_t = long_long
35
+ rbx.platform.typedef.__int_least64_t = long
23
36
  rbx.platform.typedef.__int_least8_t = char
24
- rbx.platform.typedef.__intmax_t = long_long
37
+ rbx.platform.typedef.__intfptr_t = long
38
+ rbx.platform.typedef.__intmax_t = long
25
39
  rbx.platform.typedef.__intptr_t = long
26
40
  rbx.platform.typedef.__key_t = long
27
- rbx.platform.typedef.__mode_t = uint
28
- rbx.platform.typedef.__nlink_t = ulong_long
29
- rbx.platform.typedef.__off_t = long_long
30
- rbx.platform.typedef.__paddr_t = ulong
41
+ rbx.platform.typedef.__lwpid_t = int
42
+ rbx.platform.typedef.__mode_t = ushort
43
+ rbx.platform.typedef.__nl_item = int
44
+ rbx.platform.typedef.__nlink_t = ulong
45
+ rbx.platform.typedef.__off64_t = long
46
+ rbx.platform.typedef.__off_t = long
31
47
  rbx.platform.typedef.__pid_t = int
32
- rbx.platform.typedef.__psize_t = ulong
33
48
  rbx.platform.typedef.__ptrdiff_t = long
34
- rbx.platform.typedef.__register_t = long_long
35
- rbx.platform.typedef.__rlim_t = ulong_long
49
+ rbx.platform.typedef.__register_t = long
50
+ rbx.platform.typedef.__rlim_t = long
51
+ rbx.platform.typedef.__rman_res_t = ulong
36
52
  rbx.platform.typedef.__rune_t = int
37
53
  rbx.platform.typedef.__sa_family_t = uchar
38
- rbx.platform.typedef.__segsz_t = int
54
+ rbx.platform.typedef.__segsz_t = long
39
55
  rbx.platform.typedef.__size_t = ulong
40
56
  rbx.platform.typedef.__socklen_t = uint
41
57
  rbx.platform.typedef.__ssize_t = long
42
- rbx.platform.typedef.__suseconds_t = int
43
- rbx.platform.typedef.__swblk_t = int
44
- rbx.platform.typedef.__time_t = int
45
- rbx.platform.typedef.__timer_t = int
58
+ rbx.platform.typedef.__suseconds_t = long
59
+ rbx.platform.typedef.__time_t = long
60
+ rbx.platform.typedef.__u_register_t = ulong
46
61
  rbx.platform.typedef.__uid_t = uint
47
62
  rbx.platform.typedef.__uint16_t = ushort
48
63
  rbx.platform.typedef.__uint32_t = uint
49
- rbx.platform.typedef.__uint64_t = ulong_long
64
+ rbx.platform.typedef.__uint64_t = ulong
50
65
  rbx.platform.typedef.__uint8_t = uchar
51
66
  rbx.platform.typedef.__uint_fast16_t = uint
52
67
  rbx.platform.typedef.__uint_fast32_t = uint
53
- rbx.platform.typedef.__uint_fast64_t = ulong_long
68
+ rbx.platform.typedef.__uint_fast64_t = ulong
54
69
  rbx.platform.typedef.__uint_fast8_t = uint
55
70
  rbx.platform.typedef.__uint_least16_t = ushort
56
71
  rbx.platform.typedef.__uint_least32_t = uint
57
- rbx.platform.typedef.__uint_least64_t = ulong_long
72
+ rbx.platform.typedef.__uint_least64_t = ulong
58
73
  rbx.platform.typedef.__uint_least8_t = uchar
59
- rbx.platform.typedef.__uintmax_t = ulong_long
74
+ rbx.platform.typedef.__uintfptr_t = ulong
75
+ rbx.platform.typedef.__uintmax_t = ulong
60
76
  rbx.platform.typedef.__uintptr_t = ulong
61
77
  rbx.platform.typedef.__useconds_t = uint
62
- rbx.platform.typedef.__vaddr_t = ulong
63
- rbx.platform.typedef.__vsize_t = ulong
64
- rbx.platform.typedef.__wchar_t = int
65
- rbx.platform.typedef.__wctrans_t = pointer
66
- rbx.platform.typedef.__wctype_t = pointer
78
+ rbx.platform.typedef.__vm_offset_t = ulong
79
+ rbx.platform.typedef.__vm_paddr_t = ulong
80
+ rbx.platform.typedef.__vm_size_t = ulong
67
81
  rbx.platform.typedef.__wint_t = int
82
+ rbx.platform.typedef.accmode_t = int
83
+ rbx.platform.typedef.blkcnt_t = long
84
+ rbx.platform.typedef.blksize_t = int
85
+ rbx.platform.typedef.c_caddr_t = pointer
68
86
  rbx.platform.typedef.caddr_t = string
87
+ rbx.platform.typedef.cap_ioctl_t = ulong
69
88
  rbx.platform.typedef.clock_t = int
70
89
  rbx.platform.typedef.clockid_t = int
71
- rbx.platform.typedef.cpuid_t = ulong
72
- rbx.platform.typedef.daddr32_t = int
73
- rbx.platform.typedef.daddr64_t = long_long
74
- rbx.platform.typedef.daddr_t = int
75
- rbx.platform.typedef.dev_t = ulong_long
90
+ rbx.platform.typedef.cpulevel_t = int
91
+ rbx.platform.typedef.cpusetid_t = int
92
+ rbx.platform.typedef.cpuwhich_t = int
93
+ rbx.platform.typedef.critical_t = long
94
+ rbx.platform.typedef.daddr_t = long
95
+ rbx.platform.typedef.dev_t = ulong
96
+ rbx.platform.typedef.fd_mask = ulong
97
+ rbx.platform.typedef.fflags_t = uint
76
98
  rbx.platform.typedef.fixpt_t = uint
99
+ rbx.platform.typedef.fsblkcnt_t = ulong
100
+ rbx.platform.typedef.fsfilcnt_t = ulong
77
101
  rbx.platform.typedef.gid_t = uint
78
- rbx.platform.typedef.id_t = uint
102
+ rbx.platform.typedef.id_t = long
79
103
  rbx.platform.typedef.in_addr_t = uint
80
104
  rbx.platform.typedef.in_port_t = ushort
81
- rbx.platform.typedef.ino_t = ulong_long
105
+ rbx.platform.typedef.ino_t = ulong
82
106
  rbx.platform.typedef.int16_t = short
83
107
  rbx.platform.typedef.int32_t = int
84
- rbx.platform.typedef.int64_t = long_long
108
+ rbx.platform.typedef.int64_t = long
85
109
  rbx.platform.typedef.int8_t = char
110
+ rbx.platform.typedef.int_fast16_t = int
111
+ rbx.platform.typedef.int_fast32_t = int
112
+ rbx.platform.typedef.int_fast64_t = long
113
+ rbx.platform.typedef.int_fast8_t = int
114
+ rbx.platform.typedef.int_least16_t = short
115
+ rbx.platform.typedef.int_least32_t = int
116
+ rbx.platform.typedef.int_least64_t = long
117
+ rbx.platform.typedef.int_least8_t = char
118
+ rbx.platform.typedef.intmax_t = long
86
119
  rbx.platform.typedef.intptr_t = long
87
120
  rbx.platform.typedef.key_t = long
88
- rbx.platform.typedef.mode_t = uint
89
- rbx.platform.typedef.nlink_t = ulong_long
90
- rbx.platform.typedef.off_t = long_long
91
- rbx.platform.typedef.paddr_t = ulong
121
+ rbx.platform.typedef.kpaddr_t = ulong
122
+ rbx.platform.typedef.ksize_t = ulong
123
+ rbx.platform.typedef.kssize_t = long
124
+ rbx.platform.typedef.kvaddr_t = ulong
125
+ rbx.platform.typedef.lwpid_t = int
126
+ rbx.platform.typedef.mode_t = ushort
127
+ rbx.platform.typedef.nlink_t = ulong
128
+ rbx.platform.typedef.off64_t = long
129
+ rbx.platform.typedef.off_t = long
92
130
  rbx.platform.typedef.pid_t = int
93
- rbx.platform.typedef.psize_t = ulong
131
+ rbx.platform.typedef.pthread_key_t = int
132
+ rbx.platform.typedef.ptrdiff_t = long
94
133
  rbx.platform.typedef.qaddr_t = pointer
95
- rbx.platform.typedef.quad_t = long_long
96
- rbx.platform.typedef.register_t = long_long
97
- rbx.platform.typedef.rlim_t = ulong_long
134
+ rbx.platform.typedef.quad_t = long
135
+ rbx.platform.typedef.register_t = long
136
+ rbx.platform.typedef.rlim_t = long
137
+ rbx.platform.typedef.rman_res_t = ulong
138
+ rbx.platform.typedef.rsize_t = ulong
139
+ rbx.platform.typedef.rune_t = int
98
140
  rbx.platform.typedef.sa_family_t = uchar
99
- rbx.platform.typedef.segsz_t = int
141
+ rbx.platform.typedef.sbintime_t = long
142
+ rbx.platform.typedef.segsz_t = long
100
143
  rbx.platform.typedef.size_t = ulong
101
144
  rbx.platform.typedef.socklen_t = uint
102
145
  rbx.platform.typedef.ssize_t = long
103
- rbx.platform.typedef.suseconds_t = int
104
- rbx.platform.typedef.swblk_t = int
105
- rbx.platform.typedef.time_t = int
106
- rbx.platform.typedef.timer_t = int
146
+ rbx.platform.typedef.suseconds_t = long
147
+ rbx.platform.typedef.time_t = long
107
148
  rbx.platform.typedef.u_char = uchar
108
149
  rbx.platform.typedef.u_int = uint
109
150
  rbx.platform.typedef.u_int16_t = ushort
110
151
  rbx.platform.typedef.u_int32_t = uint
111
- rbx.platform.typedef.u_int64_t = ulong_long
152
+ rbx.platform.typedef.u_int64_t = ulong
112
153
  rbx.platform.typedef.u_int8_t = uchar
113
154
  rbx.platform.typedef.u_long = ulong
114
- rbx.platform.typedef.u_quad_t = ulong_long
155
+ rbx.platform.typedef.u_quad_t = ulong
156
+ rbx.platform.typedef.u_register_t = ulong
115
157
  rbx.platform.typedef.u_short = ushort
116
158
  rbx.platform.typedef.uid_t = uint
117
159
  rbx.platform.typedef.uint = uint
118
160
  rbx.platform.typedef.uint16_t = ushort
119
161
  rbx.platform.typedef.uint32_t = uint
120
- rbx.platform.typedef.uint64_t = ulong_long
162
+ rbx.platform.typedef.uint64_t = ulong
121
163
  rbx.platform.typedef.uint8_t = uchar
164
+ rbx.platform.typedef.uint_fast16_t = uint
165
+ rbx.platform.typedef.uint_fast32_t = uint
166
+ rbx.platform.typedef.uint_fast64_t = ulong
167
+ rbx.platform.typedef.uint_fast8_t = uint
168
+ rbx.platform.typedef.uint_least16_t = ushort
169
+ rbx.platform.typedef.uint_least32_t = uint
170
+ rbx.platform.typedef.uint_least64_t = ulong
171
+ rbx.platform.typedef.uint_least8_t = uchar
172
+ rbx.platform.typedef.uintmax_t = ulong
122
173
  rbx.platform.typedef.uintptr_t = ulong
123
- rbx.platform.typedef.ulong = ulong
124
- rbx.platform.typedef.unchar = uchar
125
174
  rbx.platform.typedef.useconds_t = uint
126
175
  rbx.platform.typedef.ushort = ushort
127
- rbx.platform.typedef.vaddr_t = ulong
128
- rbx.platform.typedef.vsize_t = ulong
176
+ rbx.platform.typedef.vm_offset_t = ulong
177
+ rbx.platform.typedef.vm_ooffset_t = ulong
178
+ rbx.platform.typedef.vm_paddr_t = ulong
179
+ rbx.platform.typedef.vm_pindex_t = ulong
180
+ rbx.platform.typedef.vm_size_t = ulong
181
+ rbx.platform.typedef.wchar_t = uint
@@ -0,0 +1,100 @@
1
+ rbx.platform.typedef.*__caddr_t = char
2
+ rbx.platform.typedef.*__qaddr_t = long
3
+ rbx.platform.typedef.__blkcnt64_t = long
4
+ rbx.platform.typedef.__blkcnt_t = long
5
+ rbx.platform.typedef.__blksize_t = long
6
+ rbx.platform.typedef.__clock_t = long
7
+ rbx.platform.typedef.__clockid_t = int
8
+ rbx.platform.typedef.__daddr_t = int
9
+ rbx.platform.typedef.__dev_t = ulong
10
+ rbx.platform.typedef.__fd_mask = long
11
+ rbx.platform.typedef.__fsblkcnt64_t = ulong
12
+ rbx.platform.typedef.__fsblkcnt_t = ulong
13
+ rbx.platform.typedef.__fsfilcnt64_t = ulong
14
+ rbx.platform.typedef.__fsfilcnt_t = ulong
15
+ rbx.platform.typedef.__gid_t = uint
16
+ rbx.platform.typedef.__id_t = uint
17
+ rbx.platform.typedef.__ino64_t = ulong
18
+ rbx.platform.typedef.__ino_t = ulong
19
+ rbx.platform.typedef.__int16_t = short
20
+ rbx.platform.typedef.__int32_t = int
21
+ rbx.platform.typedef.__int64_t = long
22
+ rbx.platform.typedef.__int8_t = char
23
+ rbx.platform.typedef.__intptr_t = long
24
+ rbx.platform.typedef.__key_t = int
25
+ rbx.platform.typedef.__loff_t = long
26
+ rbx.platform.typedef.__mode_t = uint
27
+ rbx.platform.typedef.__nlink_t = ulong
28
+ rbx.platform.typedef.__off64_t = long
29
+ rbx.platform.typedef.__off_t = long
30
+ rbx.platform.typedef.__pid_t = int
31
+ rbx.platform.typedef.__priority_which_t = int
32
+ rbx.platform.typedef.__quad_t = long
33
+ rbx.platform.typedef.__rlim64_t = ulong
34
+ rbx.platform.typedef.__rlim_t = ulong
35
+ rbx.platform.typedef.__rlimit_resource_t = int
36
+ rbx.platform.typedef.__rusage_who_t = int
37
+ rbx.platform.typedef.__sig_atomic_t = int
38
+ rbx.platform.typedef.__socklen_t = uint
39
+ rbx.platform.typedef.__ssize_t = long
40
+ rbx.platform.typedef.__suseconds_t = long
41
+ rbx.platform.typedef.__swblk_t = long
42
+ rbx.platform.typedef.__time_t = long
43
+ rbx.platform.typedef.__timer_t = pointer
44
+ rbx.platform.typedef.__u_char = uchar
45
+ rbx.platform.typedef.__u_int = uint
46
+ rbx.platform.typedef.__u_long = ulong
47
+ rbx.platform.typedef.__u_quad_t = ulong
48
+ rbx.platform.typedef.__u_short = ushort
49
+ rbx.platform.typedef.__uid_t = uint
50
+ rbx.platform.typedef.__uint16_t = ushort
51
+ rbx.platform.typedef.__uint32_t = uint
52
+ rbx.platform.typedef.__uint64_t = ulong
53
+ rbx.platform.typedef.__uint8_t = uchar
54
+ rbx.platform.typedef.__useconds_t = uint
55
+ rbx.platform.typedef.blkcnt_t = long
56
+ rbx.platform.typedef.clockid_t = int
57
+ rbx.platform.typedef.daddr_t = int
58
+ rbx.platform.typedef.dev_t = ulong
59
+ rbx.platform.typedef.fd_mask = long
60
+ rbx.platform.typedef.fsblkcnt_t = ulong
61
+ rbx.platform.typedef.fsfilcnt_t = ulong
62
+ rbx.platform.typedef.gid_t = uint
63
+ rbx.platform.typedef.id_t = uint
64
+ rbx.platform.typedef.ino_t = ulong
65
+ rbx.platform.typedef.int16_t = short
66
+ rbx.platform.typedef.int32_t = int
67
+ rbx.platform.typedef.int64_t = long
68
+ rbx.platform.typedef.int8_t = char
69
+ rbx.platform.typedef.key_t = int
70
+ rbx.platform.typedef.loff_t = long
71
+ rbx.platform.typedef.mode_t = uint
72
+ rbx.platform.typedef.nlink_t = ulong
73
+ rbx.platform.typedef.off_t = long
74
+ rbx.platform.typedef.pid_t = int
75
+ rbx.platform.typedef.pthread_key_t = uint
76
+ rbx.platform.typedef.pthread_once_t = int
77
+ rbx.platform.typedef.pthread_t = ulong
78
+ rbx.platform.typedef.quad_t = long
79
+ rbx.platform.typedef.register_t = long
80
+ rbx.platform.typedef.rlim_t = ulong
81
+ rbx.platform.typedef.sa_family_t = ushort
82
+ rbx.platform.typedef.size_t = ulong
83
+ rbx.platform.typedef.socklen_t = uint
84
+ rbx.platform.typedef.ssize_t = long
85
+ rbx.platform.typedef.suseconds_t = long
86
+ rbx.platform.typedef.time_t = long
87
+ rbx.platform.typedef.timer_t = pointer
88
+ rbx.platform.typedef.u_char = uchar
89
+ rbx.platform.typedef.u_int = uint
90
+ rbx.platform.typedef.u_int16_t = ushort
91
+ rbx.platform.typedef.u_int32_t = uint
92
+ rbx.platform.typedef.u_int64_t = ulong
93
+ rbx.platform.typedef.u_int8_t = uchar
94
+ rbx.platform.typedef.u_long = ulong
95
+ rbx.platform.typedef.u_quad_t = ulong
96
+ rbx.platform.typedef.u_short = ushort
97
+ rbx.platform.typedef.uid_t = uint
98
+ rbx.platform.typedef.uint = uint
99
+ rbx.platform.typedef.ulong = ulong
100
+ rbx.platform.typedef.ushort = ushort
@@ -0,0 +1,104 @@
1
+ rbx.platform.typedef.*__caddr_t = char
2
+ rbx.platform.typedef.*__qaddr_t = long
3
+ rbx.platform.typedef.__blkcnt64_t = long
4
+ rbx.platform.typedef.__blkcnt_t = long
5
+ rbx.platform.typedef.__blksize_t = int
6
+ rbx.platform.typedef.__clock_t = long
7
+ rbx.platform.typedef.__clockid_t = int
8
+ rbx.platform.typedef.__daddr_t = int
9
+ rbx.platform.typedef.__dev_t = ulong
10
+ rbx.platform.typedef.__fd_mask = long
11
+ rbx.platform.typedef.__fsblkcnt64_t = ulong
12
+ rbx.platform.typedef.__fsblkcnt_t = ulong
13
+ rbx.platform.typedef.__fsfilcnt64_t = ulong
14
+ rbx.platform.typedef.__fsfilcnt_t = ulong
15
+ rbx.platform.typedef.__fsword_t = long
16
+ rbx.platform.typedef.__gid_t = uint
17
+ rbx.platform.typedef.__id_t = uint
18
+ rbx.platform.typedef.__ino64_t = ulong
19
+ rbx.platform.typedef.__ino_t = ulong
20
+ rbx.platform.typedef.__int16_t = short
21
+ rbx.platform.typedef.__int32_t = int
22
+ rbx.platform.typedef.__int64_t = long
23
+ rbx.platform.typedef.__int8_t = char
24
+ rbx.platform.typedef.__intptr_t = long
25
+ rbx.platform.typedef.__key_t = int
26
+ rbx.platform.typedef.__loff_t = long
27
+ rbx.platform.typedef.__mode_t = uint
28
+ rbx.platform.typedef.__nlink_t = uint
29
+ rbx.platform.typedef.__off64_t = long
30
+ rbx.platform.typedef.__off_t = long
31
+ rbx.platform.typedef.__pid_t = int
32
+ rbx.platform.typedef.__priority_which_t = int
33
+ rbx.platform.typedef.__quad_t = long
34
+ rbx.platform.typedef.__rlim64_t = ulong
35
+ rbx.platform.typedef.__rlim_t = ulong
36
+ rbx.platform.typedef.__rlimit_resource_t = int
37
+ rbx.platform.typedef.__rusage_who_t = int
38
+ rbx.platform.typedef.__sig_atomic_t = int
39
+ rbx.platform.typedef.__socklen_t = uint
40
+ rbx.platform.typedef.__ssize_t = long
41
+ rbx.platform.typedef.__suseconds_t = long
42
+ rbx.platform.typedef.__syscall_slong_t = long
43
+ rbx.platform.typedef.__syscall_ulong_t = ulong
44
+ rbx.platform.typedef.__time_t = long
45
+ rbx.platform.typedef.__timer_t = pointer
46
+ rbx.platform.typedef.__u_char = uchar
47
+ rbx.platform.typedef.__u_int = uint
48
+ rbx.platform.typedef.__u_long = ulong
49
+ rbx.platform.typedef.__u_quad_t = ulong
50
+ rbx.platform.typedef.__u_short = ushort
51
+ rbx.platform.typedef.__uid_t = uint
52
+ rbx.platform.typedef.__uint16_t = ushort
53
+ rbx.platform.typedef.__uint32_t = uint
54
+ rbx.platform.typedef.__uint64_t = ulong
55
+ rbx.platform.typedef.__uint8_t = uchar
56
+ rbx.platform.typedef.__useconds_t = uint
57
+ rbx.platform.typedef.blkcnt_t = long
58
+ rbx.platform.typedef.blksize_t = int
59
+ rbx.platform.typedef.clock_t = long
60
+ rbx.platform.typedef.clockid_t = int
61
+ rbx.platform.typedef.daddr_t = int
62
+ rbx.platform.typedef.dev_t = ulong
63
+ rbx.platform.typedef.fd_mask = long
64
+ rbx.platform.typedef.fsblkcnt_t = ulong
65
+ rbx.platform.typedef.fsfilcnt_t = ulong
66
+ rbx.platform.typedef.gid_t = uint
67
+ rbx.platform.typedef.id_t = uint
68
+ rbx.platform.typedef.ino_t = ulong
69
+ rbx.platform.typedef.int16_t = short
70
+ rbx.platform.typedef.int32_t = int
71
+ rbx.platform.typedef.int64_t = long
72
+ rbx.platform.typedef.int8_t = char
73
+ rbx.platform.typedef.key_t = int
74
+ rbx.platform.typedef.loff_t = long
75
+ rbx.platform.typedef.mode_t = uint
76
+ rbx.platform.typedef.nlink_t = uint
77
+ rbx.platform.typedef.off_t = long
78
+ rbx.platform.typedef.pid_t = int
79
+ rbx.platform.typedef.pthread_key_t = uint
80
+ rbx.platform.typedef.pthread_once_t = int
81
+ rbx.platform.typedef.pthread_t = ulong
82
+ rbx.platform.typedef.quad_t = long
83
+ rbx.platform.typedef.register_t = long
84
+ rbx.platform.typedef.rlim_t = ulong
85
+ rbx.platform.typedef.sa_family_t = ushort
86
+ rbx.platform.typedef.size_t = ulong
87
+ rbx.platform.typedef.socklen_t = uint
88
+ rbx.platform.typedef.ssize_t = long
89
+ rbx.platform.typedef.suseconds_t = long
90
+ rbx.platform.typedef.time_t = long
91
+ rbx.platform.typedef.timer_t = pointer
92
+ rbx.platform.typedef.u_char = uchar
93
+ rbx.platform.typedef.u_int = uint
94
+ rbx.platform.typedef.u_int16_t = ushort
95
+ rbx.platform.typedef.u_int32_t = uint
96
+ rbx.platform.typedef.u_int64_t = ulong
97
+ rbx.platform.typedef.u_int8_t = uchar
98
+ rbx.platform.typedef.u_long = ulong
99
+ rbx.platform.typedef.u_quad_t = ulong
100
+ rbx.platform.typedef.u_short = ushort
101
+ rbx.platform.typedef.uid_t = uint
102
+ rbx.platform.typedef.uint = uint
103
+ rbx.platform.typedef.ulong = ulong
104
+ rbx.platform.typedef.ushort = ushort
data/lib/ffi/pointer.rb CHANGED
@@ -52,7 +52,7 @@ module FFI
52
52
 
53
53
  # @param [nil,Numeric] len length of string to return
54
54
  # @return [String]
55
- # Read pointer's contents as a string, or the first +len+ bytes of the
55
+ # Read pointer's contents as a string, or the first +len+ bytes of the
56
56
  # equivalent string if +len+ is not +nil+.
57
57
  def read_string(len=nil)
58
58
  if len
@@ -85,37 +85,23 @@ module FFI
85
85
  # @param [String] str string to write
86
86
  # @param [Numeric] len length of string to return
87
87
  # @return [self]
88
- # Write +len+ first bytes of +str+ in pointer's contents and a final \0 byte.
88
+ # Write +len+ first bytes of +str+ in pointer's contents.
89
89
  #
90
90
  # Same as:
91
91
  # ptr.write_string(str, len) # with len not nil
92
92
  def write_string_length(str, len)
93
- write_string(str, len)
93
+ put_bytes(0, str, 0, len)
94
94
  end unless method_defined?(:write_string_length)
95
95
 
96
96
  # @param [String] str string to write
97
97
  # @param [Numeric] len length of string to return
98
98
  # @return [self]
99
- # Write +str+ in pointer's contents.
100
- # If +len+ is given, write the first +len+ bytes of +str+.
101
- # In both cases a final \0 byte is written after the string.
99
+ # Write +str+ in pointer's contents, or first +len+ bytes if
100
+ # +len+ is not +nil+.
102
101
  def write_string(str, len=nil)
103
- if len
104
- if len == size
105
- warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
106
- write_bytes(str, 0, len)
107
- else
108
- put_char(len, 0) # Check size before writing str
109
- write_bytes(str, 0, len)
110
- end
111
- else
112
- if str.bytesize == size
113
- warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
114
- write_bytes(str)
115
- else
116
- put_string(0, str)
117
- end
118
- end
102
+ len = str.bytesize unless len
103
+ # Write the string data without NUL termination
104
+ put_bytes(0, str, 0, len)
119
105
  end unless method_defined?(:write_string)
120
106
 
121
107
  # @param [Type] type type of data to read from pointer's contents
@@ -124,7 +124,8 @@ module FFI
124
124
  f.puts "\n\treturn 0;\n}"
125
125
  f.flush
126
126
 
127
- output = `gcc #{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`
127
+ cc = ENV['CC'] || 'gcc'
128
+ 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`
128
129
 
129
130
  unless $?.success? then
130
131
  output = output.split("\n").map { |l| "\t#{l}" }.join "\n"
@@ -82,7 +82,8 @@ module FFI
82
82
  f.puts "\n return 0;\n}"
83
83
  f.flush
84
84
 
85
- output = `gcc #{options[:cppflags]} #{options[:cflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
85
+ cc = ENV['CC'] || 'gcc'
86
+ output = `#{cc} #{options[:cppflags]} #{options[:cflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
86
87
 
87
88
  unless $?.success? then
88
89
  @found = false
data/lib/ffi/variadic.rb CHANGED
@@ -31,16 +31,7 @@
31
31
  #
32
32
 
33
33
  module FFI
34
- class VariadicInvoker
35
- def init(arg_types, type_map)
36
- @fixed = Array.new
37
- @type_map = type_map
38
- arg_types.each_with_index do |type, i|
39
- @fixed << type unless type == Type::VARARGS
40
- end
41
- end
42
-
43
-
34
+ class VariadicInvoker
44
35
  def call(*args, &block)
45
36
  param_types = Array.new(@fixed)
46
37
  param_values = Array.new
data/lib/ffi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FFI
2
- VERSION = '1.14.0'
2
+ VERSION = '1.15.2'
3
3
  end
@@ -0,0 +1,65 @@
1
+ require 'bundler'
2
+ require 'bundler/gem_helper'
3
+
4
+ class FfiGemHelper < Bundler::GemHelper
5
+ attr_accessor :cross_platforms
6
+
7
+ def install
8
+ super
9
+
10
+ task "release:guard_clean" => ["release:update_history"]
11
+
12
+ task "release:update_history" do
13
+ update_history
14
+ end
15
+
16
+ task "release:rubygem_push" => ["gem:windows", "gem:java"]
17
+ end
18
+
19
+ def hfile
20
+ "CHANGELOG.md"
21
+ end
22
+
23
+ def headline
24
+ '([^\w]*)(\d+\.\d+\.\d+(?:\.\w+)?)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
25
+ end
26
+
27
+ def reldate
28
+ Time.now.strftime("%Y-%m-%d")
29
+ end
30
+
31
+ def update_history
32
+ hin = File.read(hfile)
33
+ hout = hin.sub(/#{headline}/) do
34
+ raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version.to_s
35
+ $1 + $2 + $3 + reldate + $5
36
+ end
37
+ if hout != hin
38
+ Bundler.ui.confirm "Updating #{hfile} for release."
39
+ File.write(hfile, hout)
40
+ Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
41
+ end
42
+ end
43
+
44
+ def tag_version
45
+ Bundler.ui.confirm "Tag release with annotation:"
46
+ m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
47
+ Bundler.ui.info(m[:annotation].gsub(/^/, " "))
48
+ IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
49
+ fd.write m[:annotation]
50
+ end
51
+ yield if block_given?
52
+ rescue
53
+ Bundler.ui.error "Untagging #{version_tag} due to error."
54
+ sh_with_code "git tag -d #{version_tag}"
55
+ raise
56
+ end
57
+
58
+ def rubygem_push(path)
59
+ cross_platforms.each do |ruby_platform|
60
+ super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
61
+ end
62
+ super(path.gsub(/\.gem\z/, "-java.gem"))
63
+ super(path)
64
+ end
65
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ffi
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.0
4
+ version: 1.15.2
5
5
  platform: x64-mingw32
6
6
  authors:
7
7
  - Wayne Meissner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-18 00:00:00.000000000 Z
11
+ date: 2021-06-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -99,6 +99,7 @@ files:
99
99
  - lib/2.5/ffi_c.so
100
100
  - lib/2.6/ffi_c.so
101
101
  - lib/2.7/ffi_c.so
102
+ - lib/3.0/ffi_c.so
102
103
  - lib/ffi.rb
103
104
  - lib/ffi/abstract_memory.rb
104
105
  - lib/ffi/autopointer.rb
@@ -145,6 +146,8 @@ files:
145
146
  - lib/ffi/platform/powerpc-linux/types.conf
146
147
  - lib/ffi/platform/powerpc-openbsd/types.conf
147
148
  - lib/ffi/platform/powerpc64-linux/types.conf
149
+ - lib/ffi/platform/powerpc64le-linux/types.conf
150
+ - lib/ffi/platform/riscv64-linux/types.conf
148
151
  - lib/ffi/platform/s390-linux/types.conf
149
152
  - lib/ffi/platform/s390x-linux/types.conf
150
153
  - lib/ffi/platform/sparc-linux/types.conf
@@ -178,6 +181,7 @@ files:
178
181
  - lib/ffi/union.rb
179
182
  - lib/ffi/variadic.rb
180
183
  - lib/ffi/version.rb
184
+ - rakelib/ffi_gem_helper.rb
181
185
  - samples/getlogin.rb
182
186
  - samples/getpid.rb
183
187
  - samples/gettimeofday.rb
@@ -208,14 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
208
212
  version: '2.3'
209
213
  - - "<"
210
214
  - !ruby/object:Gem::Version
211
- version: 2.8.dev
215
+ version: 3.1.dev
212
216
  required_rubygems_version: !ruby/object:Gem::Requirement
213
217
  requirements:
214
218
  - - ">="
215
219
  - !ruby/object:Gem::Version
216
220
  version: '0'
217
221
  requirements: []
218
- rubygems_version: 3.1.2
222
+ rubygems_version: 3.2.3
219
223
  signing_key:
220
224
  specification_version: 4
221
225
  summary: Ruby FFI