rb_sys 0.9.30 → 0.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfb92c4965e75453786520f0fb761d7431f219ff506dd3508a8e097ff2e1c07e
-  data.tar.gz: fabbc5bfefd9f18697e7a4de16a903c2cf81efd6c8c380d9664ad4c7ef772bab
+  metadata.gz: f2fbb213df6fbefbf7d3092fc838dd2319055ca539083dc74600dad2341b6b2d
+  data.tar.gz: cd8f1e38419a5d4ef11cbd81720a679b82719f3366ff37e0a77b3478346764c2
 SHA512:
-  metadata.gz: be115dce5d54c80f53d63b10f01d5d15ad27b8a37b2c505f020d3c0631d2fa7310dc2c605ee90fee5c569d210db433e59d5583a543feb934ffff22f181a9d166
-  data.tar.gz: 70ac9e78c941eaa864ef47cd6810cd466130a0837b83cf789355fae88c400fa79ce3e85e1ca1c8ab861bfad513dacb234c924df1b76f3aae81511896a64c8a4d
+  metadata.gz: cd38f96f8e8cf54d2ef39c7d6570c2344ac4a1da7dcb721e5ddf9a5a7a62fb5f61e9d5d2f603051998de4ff05c2353b3be61adb72a4f56ca9d2348e704bd7536
+  data.tar.gz: 4ccbb106c216cc3b9df021dfb5bc586b4c9e20f674a5dcf050081a36926d4482c8917c633324cc9efc2ed6f7f7cc3308302ba26b8b229e1f8ca762e3cf1bd5c1

data/lib/rb_sys/cargo_builder.rb

@@ -132,9 +132,16 @@ module RbSys
       linker = cc_flag.shift
       link_args = cc_flag.flat_map { |a| ["-C", "link-arg=#{a}"] }
 
+      return mswin_link_args if linker == "cl"
+
       ["-C", "linker=#{linker}", *link_args]
     end
 
+    def mswin_link_args
+      libruby = ruby_static? ? makefile_config("LIBRUBY_A") : makefile_config("LIBRUBY")
+      ["-C", "link-arg=#{libruby}"]
+    end
+
     def libruby_args(dest_dir)
       libs = makefile_config(ruby_static? ? "LIBRUBYARG_STATIC" : "LIBRUBYARG_SHARED")
       raw_libs = Shellwords.split(libs)

data/lib/rb_sys/mkmf.rb

@@ -5,6 +5,7 @@ require "shellwords"
 require_relative "cargo_builder"
 require_relative "mkmf/config"
 
+# rubocop:disable Style/GlobalVars
 # Root module
 module RbSys
   # Helper class for creating Rust Makefiles
@@ -48,42 +49,41 @@ module RbSys
 
       full_cargo_command = cargo_command(srcdir, builder)
 
-      # rubocop:disable Style/GlobalVars
       make_install = +<<~MAKE
-        RB_SYS_BUILD_DIR ?= #{File.join(Dir.pwd, ".rb-sys")}
-        CARGO ?= cargo
-        CARGO_BUILD_TARGET ?= #{builder.target}
-        SOEXT ?= #{builder.so_ext}
+        #{conditional_assign("RB_SYS_BUILD_DIR", File.join(Dir.pwd, ".rb-sys"))}
+        #{conditional_assign("CARGO", "cargo")}
+        #{conditional_assign("CARGO_BUILD_TARGET", builder.target)}
+        #{conditional_assign("SOEXT", builder.so_ext)}
 
         # Determine the prefix Cargo uses for the lib.
-        ifneq ($(SOEXT),dll)
-          SOEXT_PREFIX ?= lib
-        endif
+        #{if_neq_stmt("$(SOEXT)", "dll")}
+        #{conditional_assign("SOEXT_PREFIX", "lib", indent: 1)}
+        #{endif_stmt}
 
-        RB_SYS_CARGO_PROFILE ?= #{builder.profile}
-        RB_SYS_CARGO_FEATURES ?= #{builder.features.join(",")}
-        RB_SYS_EXTRA_RUSTFLAGS ?= #{builder.extra_rustflags.join(" ")}
+        #{conditional_assign("RB_SYS_CARGO_PROFILE", builder.profile)}
+        #{conditional_assign("RB_SYS_CARGO_FEATURES", builder.features.join(","))}
+        #{conditional_assign("RB_SYS_EXTRA_RUSTFLAGS", builder.extra_rustflags.join(" "))}
 
         # Set dirname for the profile, since the profiles do not directly map to target dir (i.e. dev -> debug)
-        ifeq ($(RB_SYS_CARGO_PROFILE),dev)
-          RB_SYS_CARGO_PROFILE_DIR ?= debug
-        else
-          RB_SYS_CARGO_PROFILE_DIR ?= $(RB_SYS_CARGO_PROFILE)
-        endif
+        #{if_eq_stmt("$(RB_SYS_CARGO_PROFILE)", "dev")}
+        #{conditional_assign("RB_SYS_CARGO_PROFILE_DIR", "debug", indent: 1)}
+        #{else_stmt}
+        #{conditional_assign("RB_SYS_CARGO_PROFILE_DIR", "$(RB_SYS_CARGO_PROFILE)", indent: 1)}
+        #{endif_stmt}
 
         # Set the build profile (dev, release, etc.) Compat with Rust 1.51.
-        ifeq ($(RB_SYS_CARGO_PROFILE),release)
-          RB_SYS_CARGO_PROFILE_FLAG = --release
-        else
-          RB_SYS_CARGO_PROFILE_FLAG = --profile $(RB_SYS_CARGO_PROFILE)
-        endif
+        #{if_eq_stmt("$(RB_SYS_CARGO_PROFILE)", "release")}
+        #{assign_stmt("RB_SYS_CARGO_PROFILE_FLAG", "--release", indent: 1)}
+        #{else_stmt}
+        #{assign_stmt("RB_SYS_CARGO_PROFILE_FLAG", "--profile $(RB_SYS_CARGO_PROFILE)", indent: 1)}
+        #{endif_stmt}
 
         # Account for sub-directories when using `--target` argument with Cargo
-        ifneq ($(CARGO_BUILD_TARGET),)
-          RB_SYS_CARGO_BUILD_TARGET_DIR ?= target/$(CARGO_BUILD_TARGET)
-        else
-          RB_SYS_CARGO_BUILD_TARGET_DIR ?= target
-        endif
+        #{if_neq_stmt("$(CARGO_BUILD_TARGET)", "")}
+        #{assign_stmt("RB_SYS_CARGO_BUILD_TARGET_DIR", "target/$(CARGO_BUILD_TARGET)", indent: 1)}
+        #{else_stmt}
+        #{assign_stmt("RB_SYS_CARGO_BUILD_TARGET_DIR", "target", indent: 1)}
+        #{endif_stmt}
 
         target_prefix = #{target_prefix}
         TARGET_NAME = #{target[/\A\w+/]}
@@ -100,12 +100,12 @@ module RbSys
 
         #{base_makefile(srcdir)}
 
-        ifneq ($(RB_SYS_VERBOSE),)
-          Q = $(0=@)
-        endif
+        #{if_neq_stmt("$(RB_SYS_VERBOSE)", "")}
+        #{assign_stmt("Q", "$(0=@)", indent: 1)}
+        #{endif_stmt}
 
         #{env_vars(builder)}
-        $(RUSTLIB): export RUSTFLAGS := $(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)
+        #{export_env("RUSTFLAGS", "$(RUSTFLAGS) $(RB_SYS_EXTRA_RUSTFLAGS)")}
 
         FORCE: ;
 
@@ -140,7 +140,6 @@ module RbSys
 
       File.write("Makefile", make_install)
     end
-    # rubocop:enable Style/GlobalVars
 
     private
 
@@ -170,7 +169,7 @@ module RbSys
 
     def env_line(k, v)
       return unless v
-      %($(RUSTLIB): export #{k} = #{v.gsub("\n", '\n')})
+      export_env(k, v.gsub("\n", '\n'))
     end
 
     def env_or_makefile_config(key)
@@ -188,31 +187,31 @@ module RbSys
 
     def optional_rust_toolchain(builder)
       <<~MAKE
-        RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN ?= #{builder.force_install_rust_toolchain}
+        #{conditional_assign("RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN", builder.force_install_rust_toolchain)}
 
         # Only run if the we are told to explicitly install the Rust toolchain
-        ifneq ($(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN),false)
-        RB_SYS_RUSTUP_PROFILE ?= minimal
+        #{if_neq_stmt("$(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)", "false")}
+        #{conditional_assign("RB_SYS_RUSTUP_PROFILE", "minimal")}
 
         # If the user passed true, we assume stable Rust. Otherwise, use what
         # was specified (i.e. RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN=beta)
-        ifeq ($(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN),true)
+        #{if_eq_stmt("$(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)", "true")}
           RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN = stable
-        endif
+        #{endif_stmt}
 
         # If a $RUST_TARGET is specified (i.e. for rake-compiler-dock), append
         # that to the profile.
-        ifeq ($(RUST_TARGET),)
+        #{if_eq_stmt("$(RUST_TARGET)", "")}
           RB_SYS_DEFAULT_TOOLCHAIN = $(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)
-        else
+        #{else_stmt}
           RB_SYS_DEFAULT_TOOLCHAIN = $(RB_SYS_FORCE_INSTALL_RUST_TOOLCHAIN)-$(RUST_TARGET)
-        endif
+        #{endif_stmt}
 
-        export CARGO_HOME ?= $(RB_SYS_BUILD_DIR)/$(RB_SYS_DEFAULT_TOOLCHAIN)/cargo
-        export RUSTUP_HOME ?= $(RB_SYS_BUILD_DIR)/$(RB_SYS_DEFAULT_TOOLCHAIN)/rustup
-        export PATH := $(CARGO_HOME)/bin:$(RUSTUP_HOME)/bin:$(PATH)
-        export RUSTUP_TOOLCHAIN := $(RB_SYS_DEFAULT_TOOLCHAIN)
-        export CARGO := $(CARGO_HOME)/bin/cargo
+        #{conditional_assign("CARGO_HOME", "$(RB_SYS_BUILD_DIR)/$(RB_SYS_DEFAULT_TOOLCHAIN)/cargo", export: true)}
+        #{conditional_assign("RUSTUP_HOME", "$(RB_SYS_BUILD_DIR)/$(RB_SYS_DEFAULT_TOOLCHAIN)/rustup", export: true)}
+        #{export_env("PATH", "$(CARGO_HOME)/bin:$(RUSTUP_HOME)/bin:$(PATH)")}
+        #{export_env("RUSTUP_TOOLCHAIN", "$(RB_SYS_DEFAULT_TOOLCHAIN)")}
+        #{export_env("CARGO", "$(CARGO_HOME)/bin/cargo")}
 
         $(CARGO): 
         \t$(Q) $(MAKEDIRS) $(CARGO_HOME) $(RUSTUP_HOME)
@@ -221,10 +220,69 @@ module RbSys
         \trustup default $(RB_SYS_DEFAULT_TOOLCHAIN)
 
         $(RUSTLIB): $(CARGO)
-        endif
+        #{endif_stmt}
       MAKE
     end
+
+    def if_eq_stmt(a, b)
+      if $nmake
+        "!IF #{a.inspect} == #{b.inspect}"
+      else
+        "ifeq (#{a},#{b})"
+      end
+    end
+
+    def if_neq_stmt(a, b)
+      if $nmake
+        "!IF #{a.inspect} != #{b.inspect}"
+      else
+        "ifneq (#{a},#{b})"
+      end
+    end
+
+    def else_stmt
+      if $nmake
+        "!ELSE"
+      else
+        "else"
+      end
+    end
+
+    def endif_stmt
+      if $nmake
+        "!ENDIF"
+      else
+        "endif"
+      end
+    end
+
+    def conditional_assign(a, b, export: false, indent: 0)
+      if $nmake
+        result = +"!IFNDEF #{a}\n#{a} = #{b}\n!ENDIF\n"
+        result << export_env(a, b) if export
+        result
+      else
+        "#{"\t" * indent}#{export ? "export " : ""}#{a} ?= #{b}"
+      end
+    end
+
+    def assign_stmt(a, b, indent: 0)
+      if $nmake
+        "#{a} = #{b}"
+      else
+        "#{"\t" * indent}#{a} = #{b}"
+      end
+    end
+
+    def export_env(k, v)
+      if $nmake
+        "!if [set #{k}=#{v}]\n!endif"
+      else
+        "export #{k} := #{v}"
+      end
+    end
   end
 end
+# rubocop:enable Style/GlobalVars
 
 include RbSys::Mkmf # rubocop:disable Style/MixinUsage

data/lib/rb_sys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_sys
 version: !ruby/object:Gem::Version
-  version: 0.9.30
+  version: 0.9.31
 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-08-18 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Helpers for compiling Rust extensions for ruby