ffi-compiler 1.0.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d72c341f9ccb50429bfd8a3542d3c9481f7e4d2
-  data.tar.gz: 780d11e250a8e1637d287d8482c7eb319d170db8
+SHA256:
+  metadata.gz: 6b5d2323276536d7b5525a84f71e6b740d93dbb7599bc593b07c6cbe4555d71a
+  data.tar.gz: 59c2d2f0e72494eb68b396f2c99b6c78229839b363abda938869134c205b1aab
 SHA512:
-  metadata.gz: a4d9af481db298d53bba6d89b85f4f288043748ca736f84f751f1cb16ad829be4719fbf5faab58a14ebdbaa91a01d0cafbaa31104c1dbfaae6cd9093f371c1e5
-  data.tar.gz: f7d499575077854ec5913209f0ec8fb83e01028a90b93ba86c8b221bc9b31f8c135a3df6370b47cc0a5f7a611167c1ae4f0971c6cec7032e40d435ff2123395e
+  metadata.gz: '074259969bc26ce9cf1c5ef33b6e64c16bdc6f6283248ed1b2d124268d8686eb103421a3208fbfd30d43518933c65f012d3394ebb5fc9c5566564aa50f04ff35'
+  data.tar.gz: 861960b3190b87b5b6ca902b2076e12abb6788a137bc7cf04d7fb6eb27fea7b9fb673e20b887c2a6e5285c6c4a4b3bf27f7d45362360d3149851e50c32cff25e

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

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,17 +1,19 @@
+require_relative 'lib/ffi-compiler/version'
+
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler'
-  s.version = '1.0.0'
+  s.version = FFI::Compiler::VERSION
   s.author = 'Wayne Meissner'
-  s.email = 'wmeissner@gmail.com'
-  s.homepage = 'http://wiki.github.com/ffi/ffi'
+  s.email = ['wmeissner@gmail.com', 'steve@advancedcontrol.com.au']
+  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 README.md Rakefile LICENSE) + Dir.glob("{lib,spec}/**/*")
-  s.has_rdoc = false
-  s.license = 'Apache 2.0'
+  s.files = %w(ffi-compiler.gemspec Gemfile Rakefile README.md LICENSE) + Dir.glob("{lib,spec}/**/*")
+  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
+          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$/
             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

@@ -9,7 +9,11 @@ module FFI
         library = Platform.system.map_library_name(name)
         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|
+          Dir.glob("#{path}/**/#{FFI::Platform::ARCH}-#{FFI::Platform::OS}/#{library}") do |f|
+            return f
+          end
+
+          Dir.glob("#{path}/**/#{library}") do |f|
             return f
           end
 

data/lib/ffi-compiler/multi_file_task.rb

@@ -0,0 +1,41 @@
+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
+
+            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.3.1"
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Wayne Meissner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,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
@@ -67,11 +67,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby FFI library
-email: wmeissner@gmail.com
+email:
+- wmeissner@gmail.com
+- steve@advancedcontrol.com.au
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -82,13 +85,16 @@ 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,10 +109,8 @@ 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: 3.5.6
+signing_key:
 specification_version: 4
 summary: Ruby FFI Rakefile generator
 test_files: []
-has_rdoc: false