rb_sys 0.9.20 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8268ca6121f3fc20fd5f5247b8bbfbe1ce93de3b57f025d11087b77da0e49aa3
-  data.tar.gz: f5ad91cce6a8543d13ae8fd9d269bc6f3bab43d41afb02af20b0edc1152a7cd7
+  metadata.gz: 690a0a0013da370bdbe206fa6067d7f40ef4368fd7031aa24fc27d45c2f5ddbf
+  data.tar.gz: d0bea23bc70fa5109ef69cc12504e2d5ba00ca408033702803aef5c0d6a89737
 SHA512:
-  metadata.gz: 5334cc57dea7b85b73bd3807d521823992ef5d96fd52e25a7afe56df447912c17311d707be731ea6540db71c0284bbdb3ba943c2fe2fbadb5141fb698b0a5731
-  data.tar.gz: 8bfd5734a29819031e1523f4f6c63c0840471932757d97f31c41d0606145c997a4812a92c331625781259eeb34a0821620f8963477ee851d61cfbecf377f3043
+  metadata.gz: 5554e164a6bb504282013e31f56a34f44381f81785dd1f4660b8d126555fd049ca2f6c71b51c91b959740e3b721bf674fe75756eb6fbd8d4754c36df54108d69
+  data.tar.gz: ab49ec7247e0dd08203bf4dc4db749969d440deafd30c0bb00784f0883b5d02cf87d6f01de0163f2c94792653263827c5236fd02d3b9958f9ca7434c88bf1f6c

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-D�K�v3u8WQ�eAn(�(�U�/y4���
-��O��#�8Y6�HQ�Q}\�p�� �����V}aP����֪U�$�.�Q*ȼ-����Eǖ���i�I�1�:�
+=���T^�q��W�"�8<'t�u��Rs��+b�RLU�_Sk�}v	om<��ӇF`�[]�A�#����9�%-�P���gY�M�17#̋ح+��DQ�/:�+�ޖ[ե�

data/lib/rb_sys/mkmf/config.rb

@@ -4,11 +4,12 @@ module RbSys
   module Mkmf
     # Config that delegates to CargoBuilder if needded
     class Config
-      attr_accessor :force_install_rust_toolchain
+      attr_accessor :force_install_rust_toolchain, :clean_after_install
 
       def initialize(builder)
         @builder = builder
         @force_install_rust_toolchain = false
+        @clean_after_install = rubygems_invoked?
       end
 
       def method_missing(name, *args, &blk)
@@ -18,6 +19,15 @@ module RbSys
       def respond_to_missing?(name, include_private = false)
         @builder.respond_to?(name) || super
       end
+
+      private
+
+      # Seems to be the only way to reliably know if we were invoked by Rubygems.
+      # We want to know this so we can cleanup the target directory after an
+      # install, to remove bloat.
+      def rubygems_invoked?
+        ENV.key?("SOURCE_DATE_EPOCH")
+      end
     end
   end
 end

data/lib/rb_sys/mkmf.rb

@@ -88,15 +88,16 @@ module RbSys
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
-        CLEANLIBS = $(RUSTLIB) $(DLLIB) $(DEFFILE)
         RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
         TARGET = #{target}
         DLLIB = $(TARGET).#{RbConfig::CONFIG["DLEXT"]}
         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) $(RB_SYS_BUILD_DIR)
+        CLEANOBJS = $(TARGET_DIR)/.fingerprint $(TARGET_DIR)/incremental $(TARGET_DIR)/examples $(TARGET_DIR)/deps $(TARGET_DIR)/build $(TARGET_DIR)/.cargo-lock $(TARGET_DIR)/*.d $(TARGET_DIR)/*.rlib $(RB_SYS_BUILD_DIR)
         DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
+        CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
+
         #{base_makefile(srcdir)}
 
         ifneq ($(RB_SYS_VERBOSE),)
@@ -104,7 +105,7 @@ module RbSys
         endif
 
         #{env_vars(builder)}
-        $(DLLIB): export RUSTFLAGS := $(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)
+        $(RUSTLIB): export RUSTFLAGS := $(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)
 
         FORCE: ;
 
@@ -118,15 +119,19 @@ module RbSys
 
         #{optional_rust_toolchain(builder)}
 
-        $(DLLIB): $(DEFFILE) FORCE
+        $(RUSTLIB): $(DEFFILE) FORCE
         \t$(ECHO) generating $(@) \\("$(RB_SYS_CARGO_PROFILE)"\\)
         \t$(Q) #{full_cargo_command}
+
+        $(DLLIB): $(RUSTLIB)
         \t$(Q) $(COPY) "$(RUSTLIB)" $@
 
-        install: $(DLLIB) Makefile
-        \t$(ECHO) installing $(DLLIB)
+        install-so: $(DLLIB)
+        \t$(ECHO) installing $(DLLIB) to $(RUBYARCHDIR)
         \t$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-        \t$(Q) $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+        \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+
+        install: #{builder.clean_after_install ? "install-so realclean" : "install-so"}
 
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
@@ -141,8 +146,7 @@ module RbSys
 
     def base_makefile(cargo_dir)
       base_makefile = dummy_makefile(__dir__).join("\n")
-      base_makefile.gsub!("all install static install-so install-rb", "all static install-so install-rb")
-      base_makefile.gsub!("clean-so::", "clean-so:\n\t-$(Q)$(RM) $(DLLIB)\n")
+      base_makefile.gsub!("all install static install-so install-rb", "all static install-rb")
       base_makefile.gsub!(/^srcdir = .*$/, "srcdir = #{cargo_dir}")
       base_makefile
     end
@@ -159,13 +163,14 @@ module RbSys
     def env_vars(builder)
       lines = builder.build_env.map { |k, v| env_line(k, v) }
       lines << env_line("CC", env_or_makefile_config("CC"))
+      lines << env_line("CXX", env_or_makefile_config("CXX"))
       lines << env_line("AR", env_or_makefile_config("AR")) unless env_or_makefile_config("AR") == "libtool -static"
       lines.compact.join("\n")
     end
 
     def env_line(k, v)
       return unless v
-      %($(DLLIB): export #{k} = #{v.gsub("\n", '\n')})
+      %($(RUSTLIB): export #{k} = #{v.gsub("\n", '\n')})
     end
 
     def env_or_makefile_config(key)
@@ -211,11 +216,11 @@ module RbSys
 
         $(CARGO): 
         \t$(Q) $(MAKEDIRS) $(CARGO_HOME) $(RUSTUP_HOME)
-        \tcurl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
+        \tcurl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --no-modify-path --profile minimal --default-toolchain none -y
         \trustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
         \trustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
 
-        $(DLLIB): $(CARGO)
+        $(RUSTLIB): $(CARGO)
         endif
       MAKE
     end

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.23
 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-07-16 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: