rb_sys 0.9.14 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9318d5c965e51089316aba99b4a88e40c2f7fd967df965e165ef511ea4b72077
-  data.tar.gz: 39ba16bbb0686582e5f787f92fc02ef532b76e0d6667edfdda97151cbd405ad1
+  metadata.gz: 71d599b2e11fba7f3756857bf4432ad960815b0e7e75213b681df231cde59353
+  data.tar.gz: 406a359f56a69ec89a983e35d4946e7509733b2d10629e9960ccacd481331871
 SHA512:
-  metadata.gz: 1e20298824d873e17feb94a1b6803b5422b4d2a72cad3cd6149001b3a164bf4028e09e9921c1e23b06161edbcb632dd7b3e5062cc8e6608106beeef54e37a3d6
-  data.tar.gz: f2ce7a4ace0e96123a0b4833f91e713d7c6b27dc4618e86680a2b67607e50f82370bac1f01c2f8f21f42429ee927c1fa0277b433df3b1b652f9709730a640428
+  metadata.gz: 50369a209b257e4d14aba562c10313e4e5ca2c2181cab1434ce7b3eb60474a215369cf48e4da44195cf1c96eb152a842e1103f4feef76adbddf1024409b8d55c
+  data.tar.gz: 37178cd89bc1cb30ea5a8d1fb65076d132d8b6f08a66a0813022064adb3acefea4a83a52659c08472b62454809fcf64278454f859c5ee8c0616c8b3268f01bef

data/lib/rb_sys/cargo_builder.rb

@@ -11,7 +11,7 @@ module RbSys
       @profile = ENV.fetch("RB_SYS_CARGO_BUILD_PROFILE", :release).to_sym
       @env = {}
       @features = []
-      @target = ENV["CARGO_BUILD_TARGET"]
+      @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
       @extra_rustc_args = []
       @dry_run = true
       @ext_dir = nil
@@ -70,6 +70,22 @@ module RbSys
       File.join(*path_parts)
     end
 
+    # We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
+    # Ruby < 2.5
+    #
+    # @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185
+    def so_ext
+      return RbConfig::CONFIG["SOEXT"] if RbConfig::CONFIG.key?("SOEXT")
+
+      if win_target?
+        "dll"
+      elsif darwin_target?
+        "dylib"
+      else
+        "so"
+      end
+    end
+
     private
 
     def rb_config_env
@@ -227,22 +243,6 @@ module RbSys
       deffile_path
     end
 
-    # We have to basically reimplement RbConfig::CONFIG['SOEXT'] here to support
-    # Ruby < 2.5
-    #
-    # @see https://github.com/ruby/ruby/blob/c87c027f18c005460746a74c07cd80ee355b16e4/configure.ac#L3185
-    def so_ext
-      return RbConfig::CONFIG["SOEXT"] if RbConfig::CONFIG.key?("SOEXT")
-
-      if win_target?
-        "dll"
-      elsif darwin_target?
-        "dylib"
-      else
-        "so"
-      end
-    end
-
     # Corresponds to $(LIBPATH) in mkmf
     def mkmf_libpath
       ["-L", "native=#{makefile_config("libdir")}"]

data/lib/rb_sys/mkmf.rb

@@ -48,34 +48,57 @@ module RbSys
 
       # rubocop:disable Style/GlobalVars
       make_install = +<<~MAKE
+        CARGO ?= cargo
+        CARGO_BUILD_TARGET ?= #{builder.target}
+        SOEXT ?= #{builder.so_ext}
+
+        # Determine the prefix Cargo uses for the lib.
+        ifneq ($(SOEXT),dll)
+          SOEXT_PREFIX ?= lib
+        endif
+
         RB_SYS_CARGO_PROFILE ?= #{builder.profile}
         RB_SYS_CARGO_FEATURES ?= #{builder.features.join(",")}
-        CARGO ?= cargo
 
+        # Set dirname for the profile, since the profiles do not directly map to target dir (i.e. dev -> debug)
         ifeq ($(RB_SYS_CARGO_PROFILE),dev)
-          RB_SYS_TARGET_DIR ?= debug
+          RB_SYS_CARGO_PROFILE_DIR ?= debug
         else
-          RB_SYS_TARGET_DIR ?= $(RB_SYS_CARGO_PROFILE)
+          RB_SYS_CARGO_PROFILE_DIR ?= $(RB_SYS_CARGO_PROFILE)
         endif
 
+        # Set the build profile (dev, release, etc.) Compat with Rust 1.51.
         ifeq ($(RB_SYS_CARGO_PROFILE),release)
           RB_SYS_CARGO_PROFILE_FLAG = --release
         else
           RB_SYS_CARGO_PROFILE_FLAG = --profile $(RB_SYS_CARGO_PROFILE)
         endif
 
+        # Account for sub-directories when using `--target` argument with Cargo
+        ifneq ($(CARGO_BUILD_TARGET),)
+          RB_SYS_CARGO_BUILD_TARGET_DIR ?= target/$(CARGO_BUILD_TARGET)
+        else
+          RB_SYS_CARGO_BUILD_TARGET_DIR ?= target
+        endif
+
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
         CLEANLIBS = $(RUSTLIB) $(DLLIB) $(DEFFILE)
-        DISTCLEANDIRS = target/
         RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-        RUSTLIB = #{dllib_path(builder)}
         TARGET = #{target}
         DLLIB = $(TARGET).#{RbConfig::CONFIG["DLEXT"]}
-        TARGET_DIR = #{Dir.pwd}/target/$(RB_SYS_TARGET_DIR)
+        TARGET_DIR = #{Dir.pwd}/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)
+        RUSTLIB = $(TARGET_DIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
+
+        DISTCLEANDIRS = $(TARGET_DIR)
         DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
         #{base_makefile(srcdir)}
+
+        ifneq ($(RB_SYS_VERBOSE),)
+          Q = $(0=@)
+        endif
+
         #{env_vars(builder)}
 
         FORCE: ;
@@ -123,7 +146,7 @@ module RbSys
       args = ARGV.dup
       args.shift if args.first == "--"
       cargo_cmd = builder.cargo_command(dest_path, args)
-      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)")
+      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)").gsub(/-v=\d/, "")
     end
 
     def env_vars(builder)
@@ -142,14 +165,12 @@ module RbSys
       ENV[key] || RbConfig::MAKEFILE_CONFIG[key]
     end
 
-    def dllib_path(builder)
-      builder.cargo_dylib_path(File.join(Dir.pwd, "target"))
-    end
-
     def gsub_cargo_command!(cargo_command, builder:)
       cargo_command.gsub!(/--profile \w+/, "$(RB_SYS_CARGO_PROFILE_FLAG)")
       cargo_command.gsub!(%r{--features \S+}, "--features $(RB_SYS_CARGO_FEATURES)")
-      cargo_command.gsub!(%r{/target/\w+/}, "/target/$(RB_SYS_TARGET_DIR)/")
+      cargo_command.gsub!(%r{--target \S+}, "--target $(CARGO_BUILD_TARGET)")
+      target_dir = "target/#{builder.target}".chomp("/")
+      cargo_command.gsub!(%r{/#{target_dir}/[^/]+}, "/$(RB_SYS_CARGO_BUILD_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)")
       cargo_command
     end
   end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.17
 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-28 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies: []
 description:
 email: