rb_sys 0.9.21 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ef1de2cec5dcbbaaa9d8cc147b9bf727ce66c3beeb03ac6966549677a58a666
-  data.tar.gz: 5a693be7f33111e218293d7f6ff1e1ed8b4b3f1e238384a7c5f2d29ee654e713
+  metadata.gz: a91daf66ecb1b70b6f5b3d0cabdaa6481039b89e72ad5b156d4fe286da3408f5
+  data.tar.gz: 43f967183cfa5e7d3bc34f2cb5d8865d9aa4c5819cff326baeb2a6f98c4c6ea7
 SHA512:
-  metadata.gz: c3b0b95982617b6df58a1e78359858fce84510559386f537de606781bbb4d1e9431c349830ac1655140b373ec57f29b48b26705d715056d1a50b30233b362775
-  data.tar.gz: 2fc14bb752c42481d37de6b6f5e12fbcd43f55b580ddd9dc7ef158ee836fce241a990fc1b96dfa8b5babb055df5cdf828824f1983bf76a0cebddaec99442565c
+  metadata.gz: 98a191943178aa23145aaff7b61e5d0a52f459bdf0e40fd5321c0ab4c5543c559e278649be35da5c9cbb05f3dec85e00ee819690200983a60b2b37f00304adf7
+  data.tar.gz: fb16a9dc4cdbd4488fd42db1b6caccf71badeb2b23ebbe57f5dd99b0b27ef6fde6168fda8dbc2315f6ca005d12a2e31867bb7e5d2ee514c901b38cd9ab737d88

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
@@ -166,7 +170,7 @@ module RbSys
 
     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)
@@ -212,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 $(RB_SYS_RUSTUP_PROFILE) --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.21"
+  VERSION = "0.9.24"
 end

metadata

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