rb_sys 0.9.4 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f361cdc09e131225d1dc35bfd79a391df71665264e674da09b4122a0bee7096
-  data.tar.gz: b2bcbcf45a0f555aaee12136e79b756a3ab12d6daf8504d8a571d3382c1483b5
+  metadata.gz: 77fe2eb244ee95aef39a0d6541d2813fd22c00a3e677b127d0558750f0673ebd
+  data.tar.gz: 3892fbaf3193dd6248335eab7416ff63b29cd9beb1927cbbcad121165f5a8e4b
 SHA512:
-  metadata.gz: 7277d6b439a9d319d6b380118544f65706c858f54504922014990c68763c77407cd05310453266c945e6db18efa0827322b1721575d01f32f1b80074bd58339d
-  data.tar.gz: 7c2454a9bb3ccf632a696b2ad92c28d7cbda213946fbab32addc87b8237e9f317d2d4ddddb31b024d4a721bf59d1d07e286f0341709b6f24cf813da67d4db36a
+  metadata.gz: 6c3505e4db3cbdfbfc6bd5ed1cdf38098a890ff4e926b31b82f72c67d341f2b838fa306d540816ef5ffe6247e470b9c07660dc550871f65755c8725f4f20dd64
+  data.tar.gz: 44d284cae0fd02324891eb08062941f3588dec9ce23e96c02d6f4953c353dfc571e096b8ef7e2cfb167931320a68cc2223d06a304a28abf623782fad59d9e48c

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 = []
@@ -83,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
 
@@ -256,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"
@@ -309,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.4"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.7
 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-07 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby