ffi-compiler2 2.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 31b9ab69f716cfa4ccdbbfd43453cd4620763b74
-  data.tar.gz: 92bb862b4bf5b7283461dfdb66891809785a3fd9
+SHA256:
+  metadata.gz: 95124af34cb7788f67975319e8c68be47214ed3d71d9bca813e7290478bd5177
+  data.tar.gz: 31997daf9b703e2a34204ca25ffb622bdd2a94645b01e4ff624efa361790b84f
 SHA512:
-  metadata.gz: 21c4caf0223071245552777b21300797699c5158fe0473bb7bd55171f023ec312141a45faec0c706d1dc90aecf627afcf1f6df37a6e93de9e732f75d59bc9961
-  data.tar.gz: f8ab05891126e75451ed2b7e500a413f0d3bd767523bf586b310c3c73dcbc3602fea6ca034dad3c28f4e79cabd465ad6d2802a8daf2de12364bab311a7153c97
+  metadata.gz: 1086f6129c55b966fd72b0422fc95e6e6ff8daa3532d4400ae285f306f21659440596983fc21b56c25070d277e60736ccc27845abf68cdee139e42b63bc25aee
+  data.tar.gz: 3732effb97e9773f2634adf07190e9f4293e8d3c7e00cfcd160c57b08c0c403d2f7f3b488ba080714f7ef37a07aa481d45676fd5afbb8c93481959a58892b049

data/Gemfile

@@ -0,0 +1,4 @@
+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,13 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler2'
-  s.version = '2.0.0'
+  s.version = '2.2.1'
   s.author = 'Dāvis'
   s.email = 'davispuh@gmail.com'
   s.homepage = 'https://gitlab.com/davispuh/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.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'

data/lib/ffi-compiler/compile_task.rb

@@ -2,6 +2,7 @@ require 'rake'
 require 'rake/tasklib'
 require 'rake/clean'
 require 'ffi'
+require 'shellwords'
 require 'tmpdir'
 require 'rbconfig'
 require_relative 'platform'
@@ -11,6 +12,31 @@ module FFI
     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 += flag.to_s.shellsplit
+          else
+            @flags << flag
+          end
+        end
+
+        def to_a
+          @flags
+        end
+
+        def to_s
+          @flags.shelljoin
+        end
+    end
+
     class CompileTask < Rake::TaskLib
       attr_reader :cflags, :cxxflags, :ldflags, :libs, :platform
       attr_accessor :name, :ext_dir, :source_dirs, :exclude
@@ -26,9 +52,9 @@ module FFI
         @libraries = []
         @headers = []
         @functions = []
-        @cflags = DEFAULT_CFLAGS.dup
-        @cxxflags = DEFAULT_CFLAGS.dup
-        @ldflags = DEFAULT_LDFLAGS.dup
+        @cflags = Flags.new(ENV['CFLAGS']&.shellsplit || DEFAULT_CFLAGS.dup)
+        @cxxflags = Flags.new(ENV['CXXFLAGS']&.shellsplit || DEFAULT_CFLAGS.dup)
+        @ldflags = Flags.new(ENV['LDFLAGS']&.shellsplit || DEFAULT_LDFLAGS.dup)
         @libs = []
         @platform = Platform.system
         @exports = []
@@ -93,7 +119,7 @@ module FFI
         else
           so_flags << '-shared'
         end
-        so_flags = so_flags.join(' ')
+        so_flags = so_flags.shelljoin
 
         out_dir = "#{@platform.arch}-#{@platform.os}"
         if @ext_dir != '.'
@@ -106,13 +132,13 @@ 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 = (@cflags.to_a + pic_flags + iflags + @defines).shelljoin
+        cxxflags = (@cxxflags.to_a + @cflags.to_a + pic_flags + iflags + @defines).shelljoin
+        ld_flags = (@library_paths.map { |path| "-L#{path}" } + @ldflags.to_a).shelljoin
+        libs = (@libraries.map { |l| "-l#{l}" } + @libs).shelljoin
 
         src_files = []
         obj_files = []
@@ -150,7 +176,7 @@ module FFI
 
         desc "Build dynamic library"
         file lib_name => obj_files do |t|
-          sh "#{ld} #{so_flags} -o #{t.name} #{t.prerequisites.join(' ')} #{ld_flags} #{libs}"
+          sh "#{ld} #{so_flags} -o #{t.name} #{t.prerequisites.shelljoin} #{ld_flags} #{libs}"
         end
         CLEAN.include(lib_name)
 
@@ -221,7 +247,7 @@ module FFI
           File.open(path, 'w') do |f|
             f << src
           end
-          cflags = opts.join(' ')
+          cflags = opts.shelljoin
           output = File.join(dir, 'ffi-test')
           begin
             return system "#{cc} #{cflags} -o #{output} -c #{path} > #{path}.log 2>&1"

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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Dāvis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -88,7 +89,7 @@ homepage: https://gitlab.com/davispuh/ffi-compiler
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Ruby FFI Rakefile generator
 test_files: []