rb_sys 0.9.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89efba40337b3497f50ca87b01779b27375784efa2942fb70b1ff4ccd9b992ee
-  data.tar.gz: ac38b222bf1ba5d1efbc9e5bfff3cd13e02b71051b1e87cd0e1f97a72b270035
+  metadata.gz: a832bee97ea5d680aa3ce6f48b1a09d32014a977c2b4645986ebb6ba429b1037
+  data.tar.gz: df5a2605db7395caf6110efdfb034aac1fec1d0bf40924f967905bb33b789061
 SHA512:
-  metadata.gz: 4ca0411407ac7351aaa7222d55b637f0889eaca970a022fc453b0a7138bdf469c9837b87401fc07a624b5602f2a6d094b64aa23a83f25c487ce17e9f10470a43
-  data.tar.gz: 32496275e8308a237efb3894be317f9a695a8e375791a44a4fa41f6e75c3c86b3493f38c927b0f2a98003eb9c20ec8df75aec2deca680f009fd60fb2c31be9ce
+  metadata.gz: 47f4c252dec7a7cc6c625ad6688b85fc93b07df508b5141211b6a82cbaa02a4a11669c5888b44fa80e0f2cfab3a99d71c2ac34ea543479c30b22271fc50a668a
+  data.tar.gz: 2941a00f603431fca4d954c63c0a05bb7b0cd354cb49ea938b92183062f38ac52cbe945dbe414117f33852285709324d9f28f91823d198e7d1f81e81c663d749

data/lib/rb_sys/cargo_builder.rb

@@ -1,6 +1,6 @@
 module RbSys
   class CargoBuilder < Gem::Ext::Builder
-    attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args, :dry_run
+    attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir
 
     def initialize(spec)
       require "rubygems/command"
@@ -8,12 +8,13 @@ module RbSys
 
       @spec = spec
       @runner = self.class.method(:run)
-      @profile = ENV.fetch("CARGO_BUILD_PROFILE", :release).to_sym
+      @profile = ENV.fetch("RB_SYS_CARGO_BUILD_PROFILE", :release).to_sym
       @env = {}
       @features = []
       @target = ENV["CARGO_BUILD_TARGET"]
       @extra_rustc_args = []
       @dry_run = true
+      @ext_dir = nil
     end
 
     def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
@@ -29,7 +30,7 @@ module RbSys
 
     def build_crate(dest_path, results, args, cargo_dir)
       env = build_env
-      cmd = cargo_command(cargo_dir, dest_path, args)
+      cmd = cargo_command(dest_path, args)
       runner.call cmd, results, "cargo", cargo_dir, env
 
       results
@@ -41,8 +42,8 @@ module RbSys
       build_env.merge(env)
     end
 
-    def cargo_command(cargo_dir, dest_path, args = [])
-      manifest = File.join(cargo_dir, "Cargo.toml")
+    def cargo_command(dest_path, args = [])
+      manifest = File.join(ext_dir, "Cargo.toml")
       cargo = ENV.fetch("CARGO", "cargo")
 
       cmd = []
@@ -53,7 +54,6 @@ module RbSys
       cmd += ["--manifest-path", manifest]
       cmd += ["--lib"]
       cmd += ["--profile", profile.to_s]
-      cmd += ["--locked"] if profile.to_s == "release"
       cmd += Gem::Command.build_args
       cmd += args
       cmd += ["--"]
@@ -84,8 +84,7 @@ module RbSys
         *mkmf_libpath,
         *rustc_dynamic_linker_flags(dest_dir),
         *rustc_lib_flags(dest_dir),
-        *platform_specific_rustc_args(dest_dir),
-        *debug_flags
+        *platform_specific_rustc_args(dest_dir)
       ]
     end
 
@@ -257,13 +256,6 @@ module RbSys
       RbConfig.expand(val.dup)
     end
 
-    # Good balance between binary size and debugability
-    def debug_flags
-      return [] if profile == :dev
-
-      ["-C", "debuginfo=1"]
-    end
-
     # Copied from ExtConfBuilder
     def finalize_directory(dest_path, lib_dir, extension_dir)
       require "fileutils"
@@ -310,7 +302,7 @@ module RbSys
     end
 
     def profile_target_directory
-      case profile
+      case profile.to_sym
       when :release then "release"
       when :dev then "debug"
       else raise "unknown target directory for profile: #{profile}"

data/lib/rb_sys/mkmf.rb

@@ -28,7 +28,7 @@ module RbSys
     # .   r.profile = ENV.fetch('RB_SYS_CARGO_PROFILE', :dev).to_sym
     # .   r.features = %w[some_cargo_feature]
     # . end
-    def create_rust_makefile(target, srcprefix = nil, &blk)
+    def create_rust_makefile(target, &blk)
       if target.include?("/")
         target_prefix, target = File.split(target)
         target_prefix[0, 0] = "/"
@@ -41,7 +41,7 @@ module RbSys
 
       yield builder if blk
 
-      srcprefix ||= "$(srcdir)/#{srcprefix}".chomp("/")
+      srcprefix = "$(srcdir)/#{builder.ext_dir}".chomp("/")
       RbConfig.expand(srcdir = srcprefix.dup)
 
       full_cargo_command = cargo_command(srcdir, builder)
@@ -112,9 +112,11 @@ module RbSys
     end
 
     def cargo_command(cargo_dir, builder)
+      builder.ext_dir = cargo_dir
       dest_path = File.join(Dir.pwd, "target")
-      args = []
-      cargo_cmd = builder.cargo_command(cargo_dir, dest_path, args)
+      args = ARGV.dup
+      args.shift if args.first == "--"
+      cargo_cmd = builder.cargo_command(dest_path, args)
       Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)")
     end
 

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.3"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.6
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -30,7 +30,7 @@ cert_chain:
   Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
   9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
   -----END CERTIFICATE-----
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email: