ffi-libarchive-binary 0.2.3-x86_64-linux → 0.2.6-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c75e9177e75ce44db2031e540c100193b1e0a72b
-  data.tar.gz: 4153e9cabb5fdecb806d78189aba981f3b73c4bc
+SHA256:
+  metadata.gz: 1d88642078087e9926ea016870a07a3ea695bf35a56eebd6c8c9ab17cb1059ea
+  data.tar.gz: f7ec23b4e1005836b9f60348cb700d02644d6bbf0169e0931a89b35216095ba8
 SHA512:
-  metadata.gz: aec5311b26409c2736da6e1039fd572b4da78ee617e33d38090276aa158fbba1e1b926c0cc07380a5ae954a4f9a541593836c53bce6c7a414aeccdd88694e403
-  data.tar.gz: ae756b9812e4566c8e25931854ee56da2d1a074d271f7a44bc219c51a13a5bedae9f5d0f77797494eabfc857f7cce8041ea606b83d99b657965422a8d947a687
+  metadata.gz: 79f537280fb175f26a7b4014f29667501a7f0eaa4e0f49c5777b15d1d22cc966854bb0dbc488fb527447fe9b651c81c70efaee3b1ea09c57cbf4f4ae2c0beb36
+  data.tar.gz: 4fc28cda2c7c4644928ca02227ca32296899c427c0bbf93a1e735d2662955e832a81a0bea3c963270d620f85c268812cb181c85525d8e03a7a6d9886dd7b3595

data/Rakefile

@@ -12,9 +12,6 @@ end
 desc "Define the gem task to build on any platform (compile on install)"
 task "platform:any" do
   spec = Gem::Specification::load("ffi-libarchive-binary.gemspec").dup
-  spec.extensions = ['ext/extconf.rb']
-  spec.add_runtime_dependency("mini_portile2", "~> 2.0")
-
   task = Gem::PackageTask.new(spec)
   task.define
 end
@@ -22,6 +19,7 @@ end
 platforms = [
   ["x86-mingw32", "i686-w64-mingw32", "libarchive-13.dll"],
   ["x64-mingw32", "x86_64-w64-mingw32", "libarchive-13.dll"],
+  ["x64-mingw-ucrt", "x86_64-w64-mingw32", "libarchive-13.dll"],
   ["x86-linux", "i686-linux-gnu", "libarchive.so"],
   ["x86_64-linux", "x86_64-linux-gnu", "libarchive.so"],
   ["x86_64-darwin", "x86_64-darwin", "libarchive.dylib"],
@@ -39,6 +37,8 @@ platforms.each do |platform, host, lib|
     spec = Gem::Specification::load("ffi-libarchive-binary.gemspec").dup
     spec.platform = Gem::Platform.new(platform)
     spec.files += ["lib/ffi-libarchive-binary/#{lib}"]
+    spec.extensions = []
+    spec.dependencies.reject! { |d| d.name == "mini_portile2" }
 
     task = Gem::PackageTask.new(spec)
     task.define

data/ffi-libarchive-binary.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.extensions    = ['ext/extconf.rb']
 
   spec.add_runtime_dependency "ffi-libarchive", "~> 1.0"
+  spec.add_runtime_dependency "mini_portile2", "~> 2.0"
 end

data/lib/ffi-libarchive-binary/libarchive_recipe.rb

@@ -1,6 +1,9 @@
 require "mini_portile2"
 require "pathname"
 
+require_relative "zlib_recipe"
+require_relative "libexpat_recipe"
+
 module LibarchiveBinary
   class LibarchiveRecipe < MiniPortile
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
@@ -13,6 +16,9 @@ module LibarchiveBinary
         sha256: "9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a"
       }
 
+      @zlib_recipe = ZLibRecipe.new
+      @expat_recipe = LibexpatRecipe.new
+
       @target = ROOT.join(@target).to_s
     end
 
@@ -36,11 +42,56 @@ module LibarchiveBinary
       ]
     end
 
+    def configure
+      paths = [@zlib_recipe.path, @expat_recipe.path]
+      cflags = paths.map { |k| "-I#{k}/include" }.join(" ")
+      cmd = ["env", "CFLAGS=#{cflags}", "./configure"] + computed_options
+
+      execute("configure", cmd)
+
+      # drop default libexpat and zlib
+      libz = File.join(@zlib_recipe.path, "lib", "libz.a")
+      libexpat = File.join(@expat_recipe.path, "lib", "libexpat.a")
+
+      if LibarchiveBinary::windows?
+        # https://stackoverflow.com/a/14112368/902217
+        static_link_pref = "-Wl,-Bstatic,"
+        libz = libz.prepend(static_link_pref)
+        libexpat = libexpat.prepend(static_link_pref)
+      end
+
+      makefile = File.join(work_path, "Makefile")
+      replace_in_file(" -lz ", " #{libz} ", makefile)
+      replace_in_file(" -lexpat ", " #{libexpat} ", makefile)
+    end
+
+    def replace_in_file(search_str, replace_str, filename)
+      puts "Replace \"#{search_str}\" with \"#{replace_str}\" in #{filename}"
+
+      f = File.open(filename, "r")
+      content = f.read
+      f.close
+
+      content.gsub!(search_str, replace_str)
+
+      File.open(filename, "w") { |f| f << content }
+    end
+
+    def activate
+      @zlib_recipe.activate
+      @expat_recipe.activate
+
+      super
+    end
+
     def cook_if_not
       cook unless File.exist?(checkpoint)
     end
 
     def cook
+      @zlib_recipe.cook_if_not
+      @expat_recipe.cook_if_not
+
       super
 
       FileUtils.touch(checkpoint)

data/lib/ffi-libarchive-binary/libexpat_recipe.rb

@@ -0,0 +1,46 @@
+require "mini_portile2"
+
+module LibarchiveBinary
+  # based on 
+  class LibexpatRecipe < MiniPortile
+    ROOT = Pathname.new(File.expand_path("../..", __dir__))
+
+    def initialize
+      super("libexpat", "2.4.1")
+
+      @files << {
+        url: "https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.gz",
+        sha256: "a00ae8a6b96b63a3910ddc1100b1a7ef50dc26dceb65ced18ded31ab392f132b"
+      }
+
+      @target = ROOT.join(@target).to_s
+    end
+
+    def configure_defaults
+      [
+        "--host=#{@host}",
+        "--disable-shared",
+        "--enable-static",
+      ]
+    end
+
+    def configure
+      cmd = ["env", "CFLAGS=-fPIC", "LDFLAGS=-fPIC", "./configure"] + computed_options
+      execute("configure", cmd)
+    end
+
+    def checkpoint
+      File.join(@target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    end
+
+    def cook_if_not
+      cook unless File.exist?(checkpoint)
+    end
+
+    def cook
+      super
+
+      FileUtils.touch(checkpoint)
+    end
+  end
+end

data/lib/ffi-libarchive-binary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibarchiveBinary
-  VERSION = "0.2.3"
+  VERSION = "0.2.6"
 end

data/lib/ffi-libarchive-binary/zlib_recipe.rb

@@ -0,0 +1,89 @@
+require "mini_portile2"
+require "pathname"
+
+module LibarchiveBinary
+  def self.windows?
+    RbConfig::CONFIG["target_os"] =~ /mingw32|mswin/
+  end
+
+  # inspired by https://github.com/sparklemotion/nokogiri/blob/35823bd/ext/nokogiri/extconf.rb#L655
+  class ZLibRecipe < MiniPortile
+    ROOT = Pathname.new(File.expand_path("../..", __dir__))
+
+    def initialize
+      super("zlib", "1.2.11")
+
+      @files << {
+        url: "http://zlib.net/fossils/zlib-1.2.11.tar.gz",
+        sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+      }
+
+      @target = ROOT.join(@target).to_s
+    end
+
+    def configure_defaults
+      [
+        "--static"
+      ]
+    end
+
+    def configure
+      if LibarchiveBinary::windows?
+        Dir.chdir(work_path) do
+          mk = File.read("win32/Makefile.gcc")
+          File.open("win32/Makefile.gcc", "wb") do |f|
+            f.puts "BINARY_PATH = #{path}/bin"
+            f.puts "LIBRARY_PATH = #{path}/lib"
+            f.puts "INCLUDE_PATH = #{path}/include"
+            f.puts "SHARED_MODE = 0"
+            f.puts "LOC = -fPIC"
+            f.puts mk
+          end
+        end
+      else
+        cmd = ["env", "CFLAGS=-fPIC", "LDFLAGS=-fPIC", "./configure"] + computed_options
+        execute("configure", cmd)
+      end
+    end
+
+    def configured?
+      if LibarchiveBinary::windows?
+        Dir.chdir(work_path) do
+          !!(File.read("win32/Makefile.gcc") =~ /^BINARY_PATH/)
+        end
+      else
+        super
+      end
+    end
+
+    def compile
+      if LibarchiveBinary::windows?
+        execute("compile", "make -f win32/Makefile.gcc libz.a")
+      else
+        super
+      end
+    end
+
+    def install
+      if LibarchiveBinary::windows?
+        execute("install", "make -f win32/Makefile.gcc install")
+      else
+        super
+      end
+    end
+
+    def checkpoint
+      File.join(@target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    end
+
+    def cook_if_not
+      cook unless File.exist?(checkpoint)
+    end
+
+    def cook
+      super
+
+      FileUtils.touch(checkpoint)
+    end
+  end
+end

data/lib/ffi-libarchive-binary.rb

@@ -7,18 +7,32 @@ module LibarchiveBinary
   class Error < StandardError; end
 
   LIBRARY_PATH = Pathname.new(File.join(__dir__, "ffi-libarchive-binary"))
+
+  def self.lib_path
+    LIBRARY_PATH.join(lib_filename).to_s
+  end
+
+  def self.lib_filename
+    if FFI::Platform.windows?
+      "libarchive-13.dll"
+    elsif FFI::Platform.mac?
+      "libarchive.dylib"
+    else
+      "libarchive.so"
+    end
+  end
 end
 
 module Archive
   module C
     def self.ffi_lib(*args)
       prefixed = args.map do |names|
-        filenames = names.is_a?(Array) ? names : [names]
-        with_path = filenames.map(&:to_s).map do |filename|
-          LibarchiveBinary::LIBRARY_PATH.join(FFI.map_library_name(filename)).to_s
+        paths = names.is_a?(Array) ? names : [names]
+        if paths.any? { |f| f.include?("libarchive") }
+          [LibarchiveBinary.lib_path] + paths
+        else
+          names
         end
-
-        with_path + filenames
       end
 
       super(*prefixed)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: x86_64-linux
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-libarchive
@@ -42,7 +42,9 @@ files:
 - lib/ffi-libarchive-binary.rb
 - lib/ffi-libarchive-binary/libarchive.so
 - lib/ffi-libarchive-binary/libarchive_recipe.rb
+- lib/ffi-libarchive-binary/libexpat_recipe.rb
 - lib/ffi-libarchive-binary/version.rb
+- lib/ffi-libarchive-binary/zlib_recipe.rb
 - updates/config.guess
 - updates/config.sub
 homepage: https://github.com/fontist/ffi-libarchive-binary
@@ -67,8 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Binaries for ffi-libarchive