rb_sys 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ef1de2cec5dcbbaaa9d8cc147b9bf727ce66c3beeb03ac6966549677a58a666
-  data.tar.gz: 5a693be7f33111e218293d7f6ff1e1ed8b4b3f1e238384a7c5f2d29ee654e713
+  metadata.gz: 63ba0fbfb3a21414b8e379d92abf8cf37ca5b310e57360d57d42d10a1aa42b22
+  data.tar.gz: 54ab9824e5902fbe11416cd8be8529fb90f9129412bbe916b5195270ca54fb9d
 SHA512:
-  metadata.gz: c3b0b95982617b6df58a1e78359858fce84510559386f537de606781bbb4d1e9431c349830ac1655140b373ec57f29b48b26705d715056d1a50b30233b362775
-  data.tar.gz: 2fc14bb752c42481d37de6b6f5e12fbcd43f55b580ddd9dc7ef158ee836fce241a990fc1b96dfa8b5babb055df5cdf828824f1983bf76a0cebddaec99442565c
+  metadata.gz: 523f540fdbfabed2e6988871ec2bd4f2d97a20c5ab0c39a8b10181dacff50a6c32cfcfaafe1335d6f4d5454458201feb20df7fb2fc14f6a28a8b9df7c077b1c8
+  data.tar.gz: a49dc910f814519fc42d37c08ba3ce52729b90ca47bc08a1f48f9edba26e54c7bcfe234ce952b80c0a2a8a88f82565bfc7784f9ee067e92b3bbade2cc7bda4dc

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,14 +88,14 @@ module RbSys
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
-        CLEANLIBS = $(RUSTLIB) $(DLLIB) $(DEFFILE)
+        CLEANLIBS = $(RUSTLIB)
         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 $(RB_SYS_BUILD_DIR)
         DEFFILE = $(TARGET_DIR)/$(TARGET)-$(arch).def
         #{base_makefile(srcdir)}
 
@@ -123,11 +123,13 @@ module RbSys
         \t$(Q) #{full_cargo_command}
         \t$(Q) $(COPY) "$(RUSTLIB)" $@
 
-        install: $(DLLIB) Makefile
+        install-so: $(DLLIB) Makefile
         \t$(ECHO) installing $(DLLIB)
         \t$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
         \t$(Q) $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
+        install: #{builder.clean_after_install ? "install-so realclean" : "install-so"}
+
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
 
@@ -141,8 +143,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

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.21"
+  VERSION = "0.9.22"
 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.22
 platform: ruby
 authors:
 - Ian Ker-Seymer