rb_sys 0.9.42 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb891270e825b41d12d8ef69ebf94c9eac8862d6cf1649d23af775bc84f394d2
-  data.tar.gz: 3cf455c0df0e6498c4117d3c063bd4ccaa05cb6f566fe51d36b7898b552f8aec
+  metadata.gz: 7dc7cda8ec0b4b84fe72eafee24aa48c69a8bcded5713fa586baf7b3c076bf31
+  data.tar.gz: c714b3f4b84eb780fe1a57315e3d9546ed9202369c880c4fe983f3b435298c4e
 SHA512:
-  metadata.gz: f84a703e4194b91120cbeb0968680d8bacd8d4eeabb0f770f94ed00d3056d765b621d46cd89134b1077e72e54bb360594f9df62bab7a2bc676efb07f4931eaa4
-  data.tar.gz: 5cf5177fd5833d9eba38fc53529b0321d9109b772f59daa84a7d38dc447468c3aade4d8a919488a1a345164ed9589801287a0e4e02513ee9967f219f44bc0457
+  metadata.gz: dcb91faa9279bf86c4e057c235a8dcea72faa7870d694441d9dcd35614f5cb4979df1967ca1a8ea49dfc9662daf03799239cf549854ea174eec70f506500c4ab
+  data.tar.gz: f92e5fcb836a6b7acf483e5c4afde4809ec1bdd02e57f8d02c97cacfaa8d75423a83c6ebc4fc952449b750f59a886c215482fff389d766ff2b0c9aa91aa97a24

data/lib/rb_sys/cargo_builder.rb

@@ -1,7 +1,8 @@
 module RbSys
   # A class to build a Ruby gem Cargo. Extracted from `rubygems` gem, with some modifications.
   class CargoBuilder < Gem::Ext::Builder
-    attr_accessor :spec, :runner, :profile, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags
+    attr_accessor :spec, :runner, :env, :features, :target, :extra_rustc_args, :dry_run, :ext_dir, :extra_rustflags
+    attr_writer :profile
 
     def initialize(spec)
       require "rubygems/command"
@@ -9,7 +10,7 @@ module RbSys
 
       @spec = spec
       @runner = self.class.method(:run)
-      @profile = ENV.fetch("RB_SYS_CARGO_BUILD_PROFILE", :release).to_sym
+      @profile = ENV.fetch("RB_SYS_CARGO_PROFILE", :release).to_sym
       @env = {}
       @features = []
       @target = ENV["CARGO_BUILD_TARGET"] || ENV["RUST_TARGET"]
@@ -19,6 +20,12 @@ module RbSys
       @extra_rustflags = []
     end
 
+    def profile
+      return :release if rubygems_invoked?
+
+      @profile
+    end
+
     def build(_extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd)
       require "fileutils"
       require "shellwords"
@@ -243,12 +250,12 @@ module RbSys
     end
 
     def write_deffile(dest_path)
-      dest_dir = File.dirname(final_extension_path(dest_path))
-      FileUtils.mkdir_p(dest_dir)
-      deffile_path = File.join(dest_dir, "#{spec.name}-#{RbConfig::CONFIG["arch"]}.def")
-      export_prefix = makefile_config("EXPORT_PREFIX") || ""
+      deffile_path = File.join(dest_path, "#{spec.name}-#{RbConfig::CONFIG["arch"]}.def")
 
       unless dry_run
+        FileUtils.mkdir_p(dest_dir)
+        export_prefix = makefile_config("EXPORT_PREFIX") || ""
+
         File.open(deffile_path, "w") do |f|
           f.puts "EXPORTS"
           f.puts "#{export_prefix.strip}Init_#{spec.name}"
@@ -324,6 +331,10 @@ module RbSys
       end
     end
 
+    def rubygems_invoked?
+      ENV.key?("SOURCE_DATE_EPOCH")
+    end
+
     # Error raised when no cdylib artifact was created
     class DylibNotFoundError < StandardError
       def initialize(dir)

data/lib/rb_sys/mkmf.rb

@@ -64,7 +64,7 @@ module RbSys
         #{conditional_assign("SOEXT_PREFIX", "lib", indent: 1)}
         #{endif_stmt}
 
-        #{conditional_assign("RB_SYS_CARGO_PROFILE", builder.profile)}
+        #{set_cargo_profile(builder)}
         #{conditional_assign("RB_SYS_CARGO_FEATURES", builder.features.join(","))}
         #{conditional_assign("RB_SYS_GLOBAL_RUSTFLAGS", GLOBAL_RUSTFLAGS.join(" "))}
         #{conditional_assign("RB_SYS_EXTRA_RUSTFLAGS", builder.extra_rustflags.join(" "))}
@@ -84,28 +84,30 @@ module RbSys
         #{endif_stmt}
 
         # Account for sub-directories when using `--target` argument with Cargo
+        #{conditional_assign("RB_SYS_CARGO_TARGET_DIR", "target")}
         #{if_neq_stmt("$(CARGO_BUILD_TARGET)", "")}
-        #{assign_stmt("RB_SYS_CARGO_BUILD_TARGET_DIR", "target/$(CARGO_BUILD_TARGET)", indent: 1)}
+        #{assign_stmt("RB_SYS_FULL_TARGET_DIR", "$(RB_SYS_CARGO_TARGET_DIR)/$(CARGO_BUILD_TARGET)", indent: 1)}
         #{else_stmt}
-        #{assign_stmt("RB_SYS_CARGO_BUILD_TARGET_DIR", "target", indent: 1)}
+        #{assign_stmt("RB_SYS_FULL_TARGET_DIR", "$(RB_SYS_CARGO_TARGET_DIR)", indent: 1)}
         #{endif_stmt}
 
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
         TARGET_ENTRY = #{RbConfig::CONFIG["EXPORT_PREFIX"]}Init_$(TARGET_NAME)
-        RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+        RUBYARCHDIR = $(sitearchdir)$(target_prefix)
         TARGET = #{target}
         DLLIB = $(TARGET).#{RbConfig::CONFIG["DLEXT"]}
-        #{conditional_assign("TARGET_DIR", "$(RB_SYS_CARGO_BUILD_TARGET_DIR)")}
-        RUSTLIBDIR = $(TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)
+        RUSTLIBDIR = $(RB_SYS_FULL_TARGET_DIR)/$(RB_SYS_CARGO_PROFILE_DIR)
         RUSTLIB = $(RUSTLIBDIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
 
-        CLEANOBJS = $(RUSTLIBDIR)/.fingerprint $(RUSTLIBDIR)/incremental $(RUSTLIBDIR)/examples $(RUSTLIBDIR)/deps $(RUSTLIBDIR)/build $(RUSTLIBDIR)/.cargo-lock $(RUSTLIBDIR)/*.d $(RUSTLIBDIR)/*.rlib $(RB_SYS_BUILD_DIR)
-        DEFFILE = $(RUSTLIBDIR)/$(TARGET)-$(arch).def
+        CLEANOBJS = $(RUSTLIBDIR) $(RB_SYS_BUILD_DIR)
+        DEFFILE = $(RB_SYS_CARGO_TARGET_DIR)/$(TARGET)-$(arch).def
         CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
 
         #{base_makefile(srcdir)}
 
+        .PHONY: gemclean
+
         #{if_neq_stmt("$(RB_SYS_VERBOSE)", "")}
         #{assign_stmt("Q", "$(0=@)", indent: 1)}
         #{endif_stmt}
@@ -115,10 +117,6 @@ module RbSys
 
         FORCE: ;
 
-        $(RUSTLIBDIR):
-        \t$(ECHO) creating target directory \\($(@)\\)
-        \t$(Q) $(MAKEDIRS) $(RUSTLIBDIR)
-
         #{deffile_definition}
 
         #{optional_rust_toolchain(builder)}
@@ -135,7 +133,10 @@ module RbSys
         \t$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
         \t$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 
-        install: #{builder.clean_after_install ? "install-so realclean" : "install-so"}
+        gemclean:
+        \t-$(Q)$(RM_RF) $(CLEANOBJS) $(CLEANFILES) 2> /dev/null || true
+
+        install: #{builder.clean_after_install ? "install-so gemclean" : "install-so"}
 
         all: #{$extout ? "install" : "$(DLLIB)"}
       MAKE
@@ -184,7 +185,7 @@ module RbSys
       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 \S+}, "--target $(CARGO_BUILD_TARGET)")
-      cargo_command.gsub!(/--target-dir (?:(?!--).)+/, "--target-dir $(TARGET_DIR) ")
+      cargo_command.gsub!(/--target-dir (?:(?!--).)+/, "--target-dir $(RB_SYS_CARGO_TARGET_DIR) ")
       cargo_command
     end
 
@@ -194,9 +195,12 @@ module RbSys
       return unless defined?(EXPORT_PREFIX) && EXPORT_PREFIX
 
       @deffile_definition ||= <<~MAKE
-        $(DEFFILE): $(RUSTLIBDIR)
+        $(DEFFILE):
+        \t$(ECHO) creating target directory \\($(RUSTLIBDIR)\\)
+        \t$(Q) $(MAKEDIRS) $(RUSTLIBDIR)
         \t$(ECHO) generating $(@)
-        \t$(Q) ($(COPY) $(srcdir)/$(TARGET).def $@ 2> /dev/null) || (echo EXPORTS && echo $(TARGET_ENTRY)) > $@
+        \t$(ECHO) EXPORTS > $@
+        \t$(ECHO) $(TARGET_ENTRY) >> $@
       MAKE
     end
 
@@ -238,9 +242,10 @@ 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 -- --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)
+        \t$(Q) curl --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
+        \t$(Q) rustup toolchain install $(RB_SYS_DEFAULT_TOOLCHAIN) --profile $(RB_SYS_RUSTUP_PROFILE)
+        \t$(Q) rustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
+        \t$(Q) rustup component add rustfmt
 
         $(RUSTLIB): $(CARGO)
         #{endif_stmt}
@@ -311,6 +316,12 @@ module RbSys
         "export #{k} := #{v}"
       end
     end
+
+    def set_cargo_profile(builder)
+      return assign_stmt("RB_SYS_CARGO_PROFILE", "release") if builder.rubygems_invoked?
+
+      conditional_assign("RB_SYS_CARGO_PROFILE", builder.profile)
+    end
   end
 end
 # rubocop:enable Style/GlobalVars

data/lib/rb_sys/version.rb

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

metadata

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