rb_sys 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22b7aeab8b1c9d4e6ad7225f110ad9274594ac53bf1b6284421bb9728d6cdb2
-  data.tar.gz: d14f49223946ead201af5b97ab3bf872924da318427762db28939201cca10248
+  metadata.gz: 6cfe436aa013c63da8e6f04fb3e74cc73749d331b787e463b0bcf083a9e3779a
+  data.tar.gz: bd8cfba875dcb57d55bf56d686b4bfd4edaf7d61985f4d001e7bee26f58e8493
 SHA512:
-  metadata.gz: '049e3e24630545530e01983ab43288e992e73cfcc74e8b2f070735ece4aa3b1e5488a5fc473410c6539f00d162e8366c0b7aebde3bbda2cdf57f579a6d684f18'
-  data.tar.gz: 979ba1c4c4faf11316f576ea1ec103c244bb20dcca42a13e0e23cf7b886e5f249bb8169a14b6bcf2cf22aedf121b53a9e96a6068e6e6432e873924714f6368ae
+  metadata.gz: 97375efc789f2f7d24fccbc7cc7ecf7d47ad43a6604e516cea4448b44c10003772b40ada47795d879bfffa006a71f40fc63b0497aeadfe6d8e11bb9387f19f00
+  data.tar.gz: c3fa144af515113f774ad7b1390a81780f364c5c11806db402b481b4cca82d6b3ffdbdddf8d8626421c67e7be28192849742e5de1973e799ea2b0cb608c1fff5

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
+    attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args, :dry_run
 
     def initialize(spec)
       require "rubygems/command"
@@ -13,6 +13,7 @@ module RbSys
       @features = []
       @target = ENV["CARGO_BUILD_TARGET"]
       @extra_rustc_args = []
+      @dry_run = true
     end
 
     def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
@@ -217,9 +218,11 @@ module RbSys
       deffile_path = File.join(dest_dir, "#{spec.name}-#{RbConfig::CONFIG["arch"]}.def")
       export_prefix = makefile_config("EXPORT_PREFIX") || ""
 
-      File.open(deffile_path, "w") do |f|
-        f.puts "EXPORTS"
-        f.puts "#{export_prefix.strip}Init_#{spec.name}"
+      unless dry_run
+        File.open(deffile_path, "w") do |f|
+          f.puts "EXPORTS"
+          f.puts "#{export_prefix.strip}Init_#{spec.name}"
+        end
       end
 
       deffile_path

data/lib/rb_sys/mkmf.rb

@@ -25,7 +25,7 @@ module RbSys
     # . create_rust_makefile("my_extension") do |r|
     # .   # All of these are optional
     # .   r.env = { 'FOO' => 'bar' }
-    # .   r.profile = ENV.fetch('CARGO_BUILD_PROFILE', :dev).to_sym
+    # .   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)
@@ -45,36 +45,57 @@ module RbSys
       RbConfig.expand(srcdir = srcprefix.dup)
 
       full_cargo_command = cargo_command(srcdir, builder)
-      gsub_cargo_command!(full_cargo_command, builder: builder)
 
       # rubocop:disable Style/GlobalVars
-      make_install = <<~MAKE
+      make_install = +<<~MAKE
         RB_SYS_CARGO_PROFILE ?= #{builder.profile}
         RB_SYS_CARGO_FEATURES ?= #{builder.features.join(",")}
+        CARGO ?= cargo
+
+        ifeq ($(RB_SYS_CARGO_PROFILE),dev)
+          RB_SYS_TARGET_DIR ?= debug
+        else
+          RB_SYS_TARGET_DIR ?= $(RB_SYS_CARGO_PROFILE)
+        endif
+
         target_prefix = #{target_prefix}
-        CLEANLIBS = $(RUSTLIB) $(DLLIB)
+        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)
+        DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
         #{base_makefile(srcdir)}
-
         #{env_vars(builder)}
 
         FORCE: ;
 
-        $(DLLIB): FORCE
-        \t#{full_cargo_command}
-        \t$(COPY) "$(RUSTLIB)" $@
+        $(TARGET_DIR):
+        \t$(ECHO) creating target directory \\($(@)\\)
+        \t$(Q) $(MAKEDIRS) $(TARGET_DIR)
+
+        $(DEFFILE): $(TARGET_DIR)
+        \t$(ECHO) generating $(@)
+        \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
+
+        $(DLLIB): $(DEFFILE) FORCE
+        \t$(ECHO) generating $(@) \\("$(RB_SYS_CARGO_PROFILE)"\\)
+        \t$(Q) #{full_cargo_command}
+        \t$(Q) $(COPY) "$(RUSTLIB)" $@
 
         install: $(DLLIB) Makefile
-        \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+        \t$(ECHO) installing $(DLLIB)
+        \t$(Q) $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
 
+      gsub_cargo_command!(make_install, builder: builder)
+
       File.write("Makefile", make_install)
     end
     # rubocop:enable Style/GlobalVars
@@ -93,7 +114,7 @@ module RbSys
       dest_path = File.join(Dir.pwd, "target")
       args = []
       cargo_cmd = builder.cargo_command(cargo_dir, dest_path, args)
-      Shellwords.join(cargo_cmd).gsub("\\=", "=")
+      Shellwords.join(cargo_cmd).gsub("\\=", "=").gsub(/\Acargo/, "$(CARGO)")
     end
 
     def env_vars(builder)
@@ -119,6 +140,7 @@ module RbSys
     def gsub_cargo_command!(cargo_command, builder:)
       cargo_command.gsub!("--profile #{builder.profile}", "--profile $(RB_SYS_CARGO_PROFILE)")
       cargo_command.gsub!(%r{--features \S+}, "--features $(RB_SYS_CARGO_FEATURES)")
+      cargo_command.gsub!(%r{/target/\w+/}, "/target/$(RB_SYS_TARGET_DIR)/")
       cargo_command
     end
   end

data/lib/rb_sys/version.rb

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

metadata

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

metadata.gz.sig

@@ -1 +1 @@
-�I�g6J[��c��}����i���S1�*���Ո��Q�u�I�ڴ�ȴ��k�����|��	ˍ�(��H����årq�J��fT����K�N��gs�����7�#��++�C{/nЃ2%JA�o���Ä�O2F�I0�e�$2���<����W	�	΁�G�L��I�0�w[l+@��Ż���s�� �7̹=�Oɜ5��W�_��Y�Oyd��[�|)D,���m��#SF���eo;A++���B�
+7Μ4�빯��"Nm����ގ-
��Ɣ�ᦼ-�U�{��oU��