ffi-compiler2 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95124af34cb7788f67975319e8c68be47214ed3d71d9bca813e7290478bd5177
-  data.tar.gz: 31997daf9b703e2a34204ca25ffb622bdd2a94645b01e4ff624efa361790b84f
+  metadata.gz: 2c39f8a30b5d7c8773de4df502f0dd5224979e2a6371f5e7eae81df1d2e83c60
+  data.tar.gz: f873026f6d59717dfeee11bde7de662a17ccdf66b5f1ad62a608aa3073acaadd
 SHA512:
-  metadata.gz: 1086f6129c55b966fd72b0422fc95e6e6ff8daa3532d4400ae285f306f21659440596983fc21b56c25070d277e60736ccc27845abf68cdee139e42b63bc25aee
-  data.tar.gz: 3732effb97e9773f2634adf07190e9f4293e8d3c7e00cfcd160c57b08c0c403d2f7f3b488ba080714f7ef37a07aa481d45676fd5afbb8c93481959a58892b049
+  metadata.gz: a6db63080494ace5f42104d55e273c9e1f977d80ea0122873eac11b1e7c13671e01fed458026dbba2602fa3392fdf7706354067b23cf79bda22873b9880a101e
+  data.tar.gz: 37ed00181d8e1572f6504295af54e855fbd08e5a4adedf38449dbe12d0943126adc801683c6290072c49102a17b00a803357f6d0c4d38d3d66119a316cc64c38

data/ffi-compiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi-compiler2'
-  s.version = '2.2.1'
+  s.version = '2.3.0'
   s.author = 'Dāvis'
   s.email = 'davispuh@gmail.com'
   s.homepage = 'https://gitlab.com/davispuh/ffi-compiler'

data/lib/ffi-compiler/compile_task.rb

@@ -2,10 +2,11 @@ require 'rake'
 require 'rake/tasklib'
 require 'rake/clean'
 require 'ffi'
-require 'shellwords'
 require 'tmpdir'
 require 'rbconfig'
 require_relative 'platform'
+require_relative 'shell'
+require_relative 'multi_file_task'
 
 module FFI
   module Compiler
@@ -22,7 +23,7 @@ module FFI
 
         def <<(flag)
           if @raw
-            @flags += flag.to_s.shellsplit
+            @flags += shellsplit(flag.to_s)
           else
             @flags << flag
           end
@@ -33,7 +34,7 @@ module FFI
         end
 
         def to_s
-          @flags.shelljoin
+          shelljoin(@flags)
         end
     end
 
@@ -52,9 +53,9 @@ module FFI
         @libraries = []
         @headers = []
         @functions = []
-        @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)
+        @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 = []
@@ -119,7 +120,7 @@ module FFI
         else
           so_flags << '-shared'
         end
-        so_flags = so_flags.shelljoin
+        so_flags = shelljoin(so_flags)
 
         out_dir = "#{@platform.arch}-#{@platform.os}"
         if @ext_dir != '.'
@@ -135,10 +136,10 @@ module FFI
         @defines += @functions.uniq.map { |f| "-DHAVE_#{f.upcase}=1" }
         @defines += @headers.uniq.map { |h| "-DHAVE_#{h.upcase.sub(/\./, '_')}=1" }
 
-        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
+        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 = []
@@ -156,12 +157,12 @@ module FFI
           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
 
@@ -175,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.shelljoin} #{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] ] }
@@ -247,10 +249,10 @@ module FFI
           File.open(path, 'w') do |f|
             f << src
           end
-          cflags = opts.shelljoin
+          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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-compiler2
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Dāvis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,7 +83,9 @@ 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: https://gitlab.com/davispuh/ffi-compiler
 licenses: