rb_sys 0.9.43 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abede1c651510cc3d4995a424e634a9ce4afcccf1a83f85151c737ad7b578463
-  data.tar.gz: 17d3ea227ca871ae8fb1fc19a6964d57101747a8de0564b95caeda4b042ee8df
+  metadata.gz: 7dc7cda8ec0b4b84fe72eafee24aa48c69a8bcded5713fa586baf7b3c076bf31
+  data.tar.gz: c714b3f4b84eb780fe1a57315e3d9546ed9202369c880c4fe983f3b435298c4e
 SHA512:
-  metadata.gz: fbbc55012efc13e0eb0ba2c3c578a96e1cca965cc8a8691e8c3e48b008c5603df73d80fbe493b6653582a0461fb7d9b3fbeb4fa8bcbe711c33468714631883de
-  data.tar.gz: e12945fed0147192dfdc4c8cbbaa01a34a734c358c3766970e285b563bf4b866216bb489a3075e89ab4f3860d5dce078db0ab291df126006de7718c156a7a280
+  metadata.gz: dcb91faa9279bf86c4e057c235a8dcea72faa7870d694441d9dcd35614f5cb4979df1967ca1a8ea49dfc9662daf03799239cf549854ea174eec70f506500c4ab
+  data.tar.gz: f92e5fcb836a6b7acf483e5c4afde4809ec1bdd02e57f8d02c97cacfaa8d75423a83c6ebc4fc952449b750f59a886c215482fff389d766ff2b0c9aa91aa97a24

data/lib/rb_sys/cargo_builder.rb

@@ -10,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"]
@@ -250,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}"

data/lib/rb_sys/mkmf.rb

@@ -101,7 +101,7 @@ module RbSys
         RUSTLIB = $(RUSTLIBDIR)/$(SOEXT_PREFIX)$(TARGET_NAME).$(SOEXT)
 
         CLEANOBJS = $(RUSTLIBDIR) $(RB_SYS_BUILD_DIR)
-        DEFFILE = $(RUSTLIBDIR)/$(TARGET)-$(arch).def
+        DEFFILE = $(RB_SYS_CARGO_TARGET_DIR)/$(TARGET)-$(arch).def
         CLEANLIBS = $(DLLIB) $(RUSTLIB) $(DEFFILE)
 
         #{base_makefile(srcdir)}
@@ -117,10 +117,6 @@ module RbSys
 
         FORCE: ;
 
-        $(RUSTLIBDIR):
-        \t$(ECHO) creating target directory \\($(@)\\)
-        \t$(Q) $(MAKEDIRS) $(RUSTLIBDIR)
-
         #{deffile_definition}
 
         #{optional_rust_toolchain(builder)}
@@ -199,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
 

data/lib/rb_sys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbSys
-  VERSION = "0.9.43"
+  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.43
+  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: