ffi-compiler 1.0.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e259c06c4c1c6dc1b0f0ff3ac34308bef10a077f
-  data.tar.gz: 140239dc22fe032b91d7819f485082b3fda02388
+SHA256:
+  metadata.gz: 59c39f1d0d925b12810c952af5c52fd0631ab72fab24601fb7b3b2eb9359f9a0
+  data.tar.gz: 45b7b6b883d0e484c87789287bb722105521033c0a70a2dfa6c7aa51162e902e
 SHA512:
-  metadata.gz: 00c5494a75855984f97c69717d7466c5df44207007a19382029c72323831625c5ea338fb62a6d313cc8817dcc5ecc2948fdaad8c46c0e8f6f540c0da59111c10
-  data.tar.gz: 2ec65c14eeaba45f8b75d44a7c184b00fa5daa52ab0904a749ba52d2cbbc639cea6f9326b90d840a1d6d97c913331cfecd11cb6bfb33355279a9d0da3a7d9093
+  metadata.gz: 3e1fafd139b595d06c04e9edcd46818b1d58a4986aa4617a84b0e2f794395f2575012b48368c0e5d019bb4914b0b882b82ac42bf33d63548bc93d42d94cccff8
+  data.tar.gz: a58808da33f2e358d8445178dbc19aa8fea350e0a0fcbbb54f58be19fc092cbd49fc3eb238af22ae6254501c47d358eeee517bf8ee7d4cb6f3f377ece1fec884

data/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2020 FFI
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/ffi-compiler.gemspec

@@ -1,19 +1,19 @@
+require_relative 'lib/ffi-compiler/version'
+
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler'
-  s.version = '1.0.1'
+  s.version = FFI::Compiler::VERSION
   s.author = 'Wayne Meissner'
   s.email = ['wmeissner@gmail.com', 'steve@advancedcontrol.com.au']
-  s.cert_chain  = ['certs/stakach.pem']
-  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
-  s.homepage = 'http://wiki.github.com/ffi/ffi'
+  s.homepage = 'https://github.com/ffi/ffi-compiler'
   s.summary = 'Ruby FFI Rakefile generator'
   s.description = 'Ruby FFI library'
   s.files = %w(ffi-compiler.gemspec Gemfile Rakefile README.md LICENSE) + Dir.glob("{lib,spec}/**/*")
-  s.has_rdoc = false
-  s.license = 'Apache 2.0'
+  s.license = 'Apache-2.0'
   s.required_ruby_version = '>= 1.9'
   s.add_dependency 'rake'
-  s.add_dependency 'ffi', '>= 1.0.0'
+  s.add_dependency 'ffi', '>= 1.15.5'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubygems-tasks'
 end
+

data/lib/ffi-compiler/compile_task.rb

@@ -5,12 +5,39 @@ require 'ffi'
 require 'tmpdir'
 require 'rbconfig'
 require_relative 'platform'
+require_relative 'shell'
+require_relative 'multi_file_task'
 
 module FFI
   module Compiler
     DEFAULT_CFLAGS = %w(-fexceptions -O -fno-omit-frame-pointer -fno-strict-aliasing)
     DEFAULT_LDFLAGS = %w(-fexceptions)
 
+    class Flags
+      attr_accessor :raw
+
+        def initialize(flags)
+          @flags = flags
+          @raw = true # For backward compatibility
+        end
+
+        def <<(flag)
+          if @raw
+            @flags += shellsplit(flag.to_s)
+          else
+            @flags << flag
+          end
+        end
+
+        def to_a
+          @flags
+        end
+
+        def to_s
+          shelljoin(@flags)
+        end
+    end
+
     class CompileTask < Rake::TaskLib
       attr_reader :cflags, :cxxflags, :ldflags, :libs, :platform
       attr_accessor :name, :ext_dir, :source_dirs, :exclude
@@ -26,9 +53,9 @@ module FFI
         @libraries = []
         @headers = []
         @functions = []
-        @cflags = DEFAULT_CFLAGS.dup
-        @cxxflags = DEFAULT_CFLAGS.dup
-        @ldflags = DEFAULT_LDFLAGS.dup
+        @cflags = Flags.new(shellsplit(ENV['CFLAGS']) || DEFAULT_CFLAGS.dup)
+        @cxxflags = Flags.new(shellsplit(ENV['CXXFLAGS']) || DEFAULT_CFLAGS.dup)
+        @ldflags = Flags.new(shellsplit(ENV['LDFLAGS']) || DEFAULT_LDFLAGS.dup)
         @libs = []
         @platform = Platform.system
         @exports = []
@@ -93,7 +120,7 @@ module FFI
         else
           so_flags << '-shared'
         end
-        so_flags = so_flags.join(' ')
+        so_flags = shelljoin(so_flags)
 
         out_dir = "#{@platform.arch}-#{@platform.os}"
         if @ext_dir != '.'
@@ -106,36 +133,36 @@ module FFI
         lib_name = File.join(out_dir, Platform.system.map_library_name(@name))
 
         iflags = @include_paths.uniq.map { |p| "-I#{p}" }
-        @defines << @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
-        @defines << @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
+        @defines += @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
+        @defines += @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
 
-        cflags = (@cflags + pic_flags + iflags + @defines).join(' ')
-        cxxflags = (@cxxflags + @cflags + pic_flags + iflags + @defines).join(' ')
-        ld_flags = (@library_paths.map { |path| "-L#{path}" } + @ldflags).join(' ')
-        libs = (@libraries.map { |l| "-l#{l}" } + @libs).join(' ')
+        cflags = shelljoin(@cflags.to_a + pic_flags + iflags + @defines)
+        cxxflags = shelljoin(@cxxflags.to_a + @cflags.to_a + pic_flags + iflags + @defines)
+        ld_flags = shelljoin(@library_paths.map { |path| "-L#{path}" } + @ldflags.to_a)
+        libs = shelljoin(@libraries.map { |l| "-l#{l}" } + @libs)
 
         src_files = []
         obj_files = []
         @source_dirs.each do |dir|
-          files = FileList["#{dir}/**/*.{c,cpp}"]
-	  unless @exclude.empty?
-	    files.delete_if { |f| f =~ Regexp.union(*@exclude) }
-	  end
+          files = FileList["#{dir}/**/*.{c,cpp,m}"]
+          unless @exclude.empty?
+            files.delete_if { |f| f =~ Regexp.union(*@exclude) }
+          end
           src_files += files
           obj_files += files.ext('.o').map { |f| File.join(out_dir, f.sub(/^#{dir}\//, '')) }
-	end
+        end
 
         index = 0
         src_files.each do |src|
           obj_file = obj_files[index]
-          if src =~ /\.c$/
+          if src =~ /\.[cm]$/
             file obj_file => [ src, File.dirname(obj_file) ] do |t|
-              sh "#{cc} #{cflags} -o #{t.name} -c #{t.prerequisites[0]}"
+              sh "#{cc} #{cflags} -o #{shellescape(t.name)} -c #{shellescape(t.prerequisites[0])}"
             end
 
           else
             file obj_file => [ src, File.dirname(obj_file) ] do |t|
-              sh "#{cxx} #{cxxflags} -o #{t.name} -c #{t.prerequisites[0]}"
+              sh "#{cxx} #{cxxflags} -o #{shellescape(t.name)} -c #{shellescape(t.prerequisites[0])}"
             end
           end
 
@@ -149,15 +176,16 @@ module FFI
         obj_files.map { |f| File.dirname(f) }.sort.uniq.map { |d| directory d }
 
         desc "Build dynamic library"
-        file lib_name => obj_files do |t|
-          sh "#{ld} #{so_flags} -o #{t.name} #{t.prerequisites.join(' ')} #{ld_flags} #{libs}"
+        MultiFileTask.define_task(lib_name => src_files + obj_files) do |t|
+          objs = t.prerequisites.select { |file| file.end_with?('.o') }
+          sh "#{ld} #{so_flags} -o #{shellescape(t.name)} #{shelljoin(objs)} #{ld_flags} #{libs}"
         end
         CLEAN.include(lib_name)
 
         @exports.each do |e|
           desc "Export #{e[:rb_file]}"
           file e[:header] => [ e[:rb_file] ] do |t|
-            ruby "-I#{File.join(File.dirname(__FILE__), 'fake_ffi')} -I#{File.dirname(t.prerequisites[0])} #{File.join(File.dirname(__FILE__), 'exporter.rb')} #{t.prerequisites[0]} #{t.name}"
+            ruby "-I#{File.join(File.dirname(__FILE__), 'fake_ffi')} -I#{File.dirname(t.prerequisites[0])} #{File.join(File.dirname(__FILE__), 'exporter.rb')} #{shellescape(t.prerequisites[0])} #{shellescape(t.name)}"
           end
 
           obj_files.each { |o| file o  => [ e[:header] ] }
@@ -221,10 +249,10 @@ module FFI
           File.open(path, 'w') do |f|
             f << src
           end
-          cflags = opts.join(' ')
+          cflags = shelljoin(opts)
           output = File.join(dir, 'ffi-test')
           begin
-            return system "#{cc} #{cflags} -o #{output} -c #{path} > #{path}.log 2>&1"
+            return system "#{cc} #{cflags} -o #{shellescape(output)} -c #{shellescape(path)} > #{shellescape(path)}.log 2>&1"
           rescue
             return false
           end

data/lib/ffi-compiler/loader.rb

@@ -7,9 +7,26 @@ module FFI
     module Loader
       def self.find(name, start_path = nil)
         library = Platform.system.map_library_name(name)
+        start_path ||= caller_path(caller[0])
+
+        # Load from modern extension fast-path when called from an active gem spec
+        if defined?(Gem::Specification) &&
+           (spec = Gem::Specification.find_active_stub_by_path(library)) &&
+           spec.respond_to?(:extension_dir) &&
+           start_path.start_with?(spec.gem_dir)
+
+          ext_path = File.join(spec.extension_dir, library)
+          return ext_path if File.exist?(ext_path)
+        end
+
+        # Try to find the library in the legacy lib path, passed start_path or local folder
         root = false
-        Pathname.new(start_path || caller_path(caller[0])).ascend do |path|
-          Dir.glob("#{path}/**/{#{FFI::Platform::ARCH}-#{FFI::Platform::OS}/#{library},#{library}}") do |f|
+        Pathname.new(start_path).ascend do |path|
+          Dir.glob("#{path}/**/#{FFI::Platform::ARCH}-#{FFI::Platform::OS}/#{library}") do |f|
+            return f
+          end
+
+          Dir.glob("#{path}/**/#{library}") do |f|
             return f
           end
 
@@ -33,4 +50,4 @@ module FFI
       end
     end
   end
-end
+end

data/lib/ffi-compiler/multi_file_task.rb

@@ -0,0 +1,47 @@
+require 'rake'
+
+module FFI
+    module Compiler
+        class MultiFileTask < Rake::MultiTask
+            def needed?
+                begin
+                    @application.options.build_all || out_of_date?(File.mtime(name))
+                rescue Errno::ENOENT
+                    true
+                end
+            end
+
+            def timestamp
+                begin
+                    File.mtime(name)
+                rescue Errno::ENOENT
+                    Rake::LATE
+                end
+            end
+
+            def invoke_with_call_chain(task_args, invocation_chain)
+              return unless needed?
+              super
+            end
+
+            # This is here for backwards-compatibility so we have namespace-free name
+            # FileTask (which we used in past) never uses scope
+            def self.scope_name(scope, task_name)
+                task_name
+            end
+
+            private
+
+            def out_of_date?(timestamp)
+                all_prerequisite_tasks.any? do |prereq|
+                    prereq_task = application[prereq, @scope]
+                    if prereq_task.instance_of?(Rake::FileTask)
+                        File.exist?(prereq_task.name) && prereq_task.timestamp > timestamp
+                    else
+                        prereq_task.needed?
+                    end
+                end
+            end
+        end
+    end
+end

data/lib/ffi-compiler/shell.rb

@@ -0,0 +1,24 @@
+require 'shellwords'
+require 'rbconfig'
+
+def shellescape(str)
+    return str unless str
+    if FFI::Platform::OS == 'windows'
+        '"' + str.gsub('"', '""') + '"'
+    else
+        str.shellescape
+    end
+end
+
+def shelljoin(args)
+    if FFI::Platform::OS == 'windows'
+        args.reduce { |cmd, arg| cmd + ' ' + shellescape(arg) }
+    else
+        args.shelljoin
+    end
+end
+
+def shellsplit(str)
+    return str unless str
+    str.shellsplit
+end

data/lib/ffi-compiler/version.rb

@@ -0,0 +1,7 @@
+
+module FFI
+  module Compiler
+    VERSION = "1.4.2"
+  end
+end
+

metadata

@@ -1,37 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Wayne Meissner
-autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDvDCCAqSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBaMQ4wDAYDVQQDDAVzdGV2
-  ZTEfMB0GCgmSJomT8ixkARkWD2FkdmFuY2VkY29udHJvbDETMBEGCgmSJomT8ixk
-  ARkWA2NvbTESMBAGCgmSJomT8ixkARkWAmF1MB4XDTE2MDYyNjIyMjMyMloXDTE3
-  MDYyNjIyMjMyMlowWjEOMAwGA1UEAwwFc3RldmUxHzAdBgoJkiaJk/IsZAEZFg9h
-  ZHZhbmNlZGNvbnRyb2wxEzARBgoJkiaJk/IsZAEZFgNjb20xEjAQBgoJkiaJk/Is
-  ZAEZFgJhdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvI6Zfmxakj
-  ADC7rWDhCtHDSCdn2jrzeMDO2xqq9P315j0x7YVglKF49Xz7OCnWGxn0Zzec22Ha
-  xq2St09wLPtE6+/qTiq48ffxLKPR/Aahdk31HGx5AXDjRQ5p48m5CK3BDratshbi
-  ssg2bVMOxMSnNowb5Mqc448X2shYHwfuo9C4fsvkn0eC+XtpwOKBsLJnmYxI8opB
-  A6cL5onHD1JH5Ywt7mWn3XCGEZY98Hq3V7wpCACWSHP9FfCmf0Vyn30UTlBivoUh
-  qmtLB+TDW4Qvma/1cc7p1e3HF9xQHSza9FTyfhzw/vxnSF+jT4upUtXdhCTMqqDv
-  m597hs3/6z8CAwEAAaOBjDCBiTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUqqCOTfINjbAqX/8nFvbzHcYG8xIwJwYDVR0RBCAwHoEcc3RldmVAYWR2
-  YW5jZWRjb250cm9sLmNvbS5hdTAnBgNVHRIEIDAegRxzdGV2ZUBhZHZhbmNlZGNv
-  bnRyb2wuY29tLmF1MA0GCSqGSIb3DQEBBQUAA4IBAQB/DUhYFbdLHAuZMgjwNUxF
-  tnf3a2o40p9mEtVm48yxfP9/9w6xh+gRN/rbBCkKbe2zSue9Nnr3zfKNONfqePlz
-  9BZOMx7LO/wFOkuWONIU+U7v5Obxi7a0bjZ6OQnY5M6FpuWG5RT6hVIlkbrh40Xd
-  SgbJ2CyHXTL3tC7ykvvI5nXQLE6OG8lyHk5Cop2Lbm4qeBVCVEDgDsXi/PFP+hjk
-  wpN2wi2CVPoj+c4bOYxgvF17WNGDWYdVEXXCRzoqGbA2kLbTH1o9BxI6NBzmfwyH
-  LY7uYxN8Hy8S4Oto/gB1eREHqYwwXt3TmlJ6kAVGbO5y9xblPncdnfwNLCUnPfxN
-  -----END CERTIFICATE-----
-date: 2016-07-07 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.15.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,13 +84,15 @@ files:
 - lib/ffi-compiler/fake_ffi/ffi-compiler/loader.rb
 - lib/ffi-compiler/fake_ffi/ffi.rb
 - lib/ffi-compiler/loader.rb
+- lib/ffi-compiler/multi_file_task.rb
 - lib/ffi-compiler/platform.rb
+- lib/ffi-compiler/shell.rb
 - lib/ffi-compiler/task.rb
-homepage: http://wiki.github.com/ffi/ffi
+- lib/ffi-compiler/version.rb
+homepage: https://github.com/ffi/ffi-compiler
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,10 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Ruby FFI Rakefile generator
 test_files: []
-has_rdoc: false

checksums.yaml.gz.sig

@@ -1 +0,0 @@
-zpt���,�P��I��􃦄߿�5��=�r�[���	RT�gɬ�(x�U�Ȱ�g}� �w��g��0>޽��H�|e>#�]D��i�%���S���2/�U���p-?}��|"Hv�ME������~1,ø��i�CB��٘T�jA��� h���d.���E@d�.D�$�8�:5it)�XKI��0�Hn��歄@5RX�˩%5ɕ�dj�r�4ֻԲa
��HQGT(L�W��ӈ"cF!���

metadata.gz.sig

@@ -1 +0,0 @@
-g`�.��8��&��������j�?\&��”��O0�b������qŖ]����W��J>M�9�.������sX���:�s(t�,F�@��Z]=���\�t�G���Ղ�å�q�O�*)r\�W�=��