mingw-make 1.1.0-x64-mingw-ucrt → 1.2.0-x64-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 464742e744f8cd5ef6d7d1cf17eb17ba7bbc1f00f081a33a79953e3ce3769574
-  data.tar.gz: a5830fd8eb38b0c357e1bac919c2b56a057649695ba3284765ac29707c841db4
+  metadata.gz: ee69bb2bcae4f8e3cf824914e88bacf4d4e3dcea1884b85792f7c1794641a516
+  data.tar.gz: 456ce51aee4a68614fa8802337d7078b40bf54a7f6a19a57a46ee37663d1b02a
 SHA512:
-  metadata.gz: e03015f78e7ad3e3a9ffd22cf5e5447b6b304d6470797e1c9c1a00f2ce0c10b1a38b138416941dae25becc9c463ac445c26f33279e74637dd304b5f69dae2110
-  data.tar.gz: ac7c8b11b3ee4d2ab263bd88a3ee9cfac2fc306166943411f53540cfde26f7c3fda830df3a142309064289145c185938f5f29f4c68c37312f9136194f17fc205
+  metadata.gz: aa8b3f61669b40cb8c2e9c1ce99353e5c5466560bbc420727b1c7ec17fa2cfaf1ddb14a19708bb4a67487280f2eb100960e80207e3b640dcc32108ade60d0ece
+  data.tar.gz: 7fd22148216bd2ee246331db9a4416ec23c90ba03f3e2ec0f06c0a045c0948e419d7eeb71d46aba0ed2d3e7aacb3e63a04184fb0128c1e6b36f49ba6fbb1c1fa

data/README.md

@@ -4,39 +4,52 @@ However, [__Minimum__ GNU for Windows (MinGW)](https://github.com/niXman/mingw-b
 a key component of MSYS2, is sufficient for half of the jobs all on its own.
 
 `mingw-make` is a set of tiny non-intrusive mods for [RubyInstaller2 for Windows](https://rubyinstaller.org)
-that solves the hurdles on the other half minimally.
+that solves the hurdles on the other half minimally, namely by replacing `rbconfig` entries of compilation commands.
 With the aid of the secret [`ruby -run`](https://github.com/ruby/un) capability it has unleashed,
 all it took was a couple of quick hacks and we have ourselves a lightweight Devkit.
 
 Setups with MinGW and RubyInstaller’s prebuilds with these patches are ideal to keep footprints small,
-for experts strongly recommend WSL for a fully-fledged Ruby environment.
+though experts strongly recommend WSL for a fully-fledged Ruby environment.
 
 ### Compatibility
 
-This is a newly published experiment; I have only tested with the following projects.
-In theory, it’s compatible with anything that doesn’t leave [`mkmf`](https://rubyapi.org/o/MakeMakefile)’s comfort zone,
+I’m glad to announce that, except for Prism for which I have sent PRs,
+**this experiment works with `gem update` versions of every [Default and Bundled C extension](https://stdgems.org) 📈**.
+
+While I have only tested this experiment with the following projects,
+In theory, it’s compatible with anything that doesn’t leave
+[`rbconfig`](https://rubyapi.org/o/RbConfig)+[`mkmf`](https://rubyapi.org/o/MakeMakefile)’s comfort zone,
 which I expect to be the majority of C-based gems. (It *will indeed* “take a while” when “Building native extensions”.)
 Please do [let me know](https://github.com/ParadoxV5/ruby-mingw-make/issues)
 if it doesn’t meet the expectations on something not unusual.
 
 #### builds
-* `bigdecimal 3.1.6..3.1.7`
+
+* __`railties 7.1.3`__
+  * `bigdecimal 3.1.6..3.1.8`
+  * `racc 1.7.3..1.8.0`
+  * `io-console 0.7.2`
 * `json 2.7.2`
-* `io-console 0.7.2`
 * `nkf 0.2.0`
+* [`prism 9bb8710`](https://github.com/ruby/prism/pull/2711)
 * `strscan 3.1.0`
 * `debug 1.9.2`
-* `racc 1.7.3`
+* `rbs 3.4.4`
 
 #### fails
-* `prism 0.24.0`:
+* `prism ..0.29.0`:
   > * It must be possible to build prism without needing ruby/rake/etc.
   >   Because once prism is the single parser in TruffleRuby, JRuby or CRuby there won't be another Ruby parser around to parse such Ruby code.
   >   \[…]
   > 
   > The main solution for the second point seems a Makefile, otherwise many of the usages would have to duplicate the logic to build prism.
+  > 
   > ⸺ https://github.com/ruby/prism/blob/19c67fb/docs/build_system.md#requirements
-* `ffi 1.16.3`: see also https://github.com/ffi/ffi/issues/1091
+* `ffi` (the platform-agnostic edition)
+  * RubyGems will instead prefer [the prebuilt gem](https://rubygems.org/gems/ffi/versions/1.17.0.rc2-x64-mingw-ucrt)
+    once it leaves RC. For now, you can join the preview manually with `gem install --prerelease ffi`.
+    * This transitive dependency is the last obstable before
+      [`steep`](https://github.com/soutaro/steep) becomes available!
 
 ### not thoroughly tested
 * `syslog 0.1.2`: [It’s UNIX-specific.](https://stackoverflow.com/a/9503254)
@@ -74,10 +87,15 @@ end
 ```
 
 ### Use manually
-Specify `mingw32-make` as the `MAKE` tool and prepend the `lib/mingw-make/mkmf.rb` script to the Ruby `$LOAD_PATH`.
+*Prepend* (so it takes precedence) the [`lib/mingw-make/mkmf.rb`](lib/mingw-make/mkmf.rb)
+script to the Ruby `$LOAD_PATH`. Because RubyGems `require 'rbconfig'`,
+we must explicitly apply [the `rbconfig` replacements](lib/mingw-make/rbconfig-patch.rb).
+```bat
+set RUBYOPT=-Ipath/to/gems/mingw-make/lib/mingw-make/ -rrbconfig-patch
+```
+You may also need to specify a fallback for the `MAKE` tool, e.g.:
 ```bat
 set MAKE=mingw32-make
-set RUBYOPT=-Ipath/to/gems/mingw-make/lib/mingw-make/
 ```
 
 

data/lib/mingw-make/mkmf.rb

@@ -1,22 +1,5 @@
 # frozen_string_literal: true
-
-require 'rbconfig'
-
-# Get `mkmf` to fall back to `ruby -run` 
-%w[
-  RM
-  RMALL
-  RMDIRS
-  MAKEDIRS
-  INSTALL
-  INSTALL_PROG
-  INSTALL_DATA
-  CP
-].each do|key|
-  RbConfig::CONFIG.delete key
-  RbConfig::MAKEFILE_CONFIG.delete key
-end
-
+require_relative 'rbconfig-patch'
 require File.join RbConfig::CONFIG['rubylibdir'], 'mkmf'
 
 module MakeMakefile

data/lib/mingw-make/rbconfig-patch.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Normally, RubyGems `require`s `rbconfig` itself, so overloading `require 'rbconfig'` may be ineffective.
+# Howëver, if RubyGems are disabled (`--disable-gems`), nameing this file `rbconfig.rb` would conflict with the design,
+# which depends on the original {RbConfig} to bypass the modified `$LOAD_PATH` to fetch the original {MakeMakefile}.
+
+require 'rbconfig'
+
+# Use `ruby -run` fall-backs 
+install      =  'ruby -run -e install -- -p'
+fixed = {
+  'RM'       => 'ruby -run -e rm -- -f',
+  'RMALL'    => 'ruby -run -e rm -- -rf',
+  'RMDIRS'   => 'ruby -run -e rmdir -- -p',
+  'MAKEDIRS' => 'ruby -run -e mkdir -- -p',
+  'CP'       => 'ruby -run -e cp --',
+  'INSTALL'  => install
+}
+install_args = {
+  'INSTALL_PROG' => '-m 0755',
+  'INSTALL_DATA' => '-m 0644'
+}
+RbConfig::MAKEFILE_CONFIG.merge! fixed, install_args.transform_values { "$(INSTALL) #{_1}" }
+RbConfig::CONFIG.merge!          fixed, install_args.transform_values { "#{install} #{_1}" }

data/lib/mingw-make.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-# Set up `RUBYOPT=-I/absolute/path/to/lib/mingw-make/` for subprocesses
-ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -I#{File.join __dir__, 'mingw-make'}"
+# Set up `RUBYOPT=-I/absolute/path/to/lib/mingw-make/ -rrbconfig-patch` for subprocesses
+ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -I#{File.join __dir__, 'mingw-make'} -rrbconfig-patch"
 ENV['MAKE'] ||= 'make'

data/mingw-make.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do|spec|
   spec.name = 'mingw-make'
   spec.summary = 'Patches that enable Windows Ruby to install C extension gems with MinGW without MSYS2 (Devkit)'
-  spec.version = '1.1.0'
+  spec.version = '1.2.0'
   spec.author = 'ParadoxV5'
   spec.license = 'WTFPL'
   
@@ -15,8 +15,8 @@ Gem::Specification.new do|spec|
     'bug_tracker_uri'   => File.join(github, 'issues'),
     'funding_uri'       => "https://github.com/sponsors/#{github_account}"
   }
-
-  spec.files = Dir['**/*']
+  
+  spec.files = Dir['**/*'].grep_v 'Gemfile'
   spec.executable = 'make'
   
   spec.platform = 'x64-mingw-ucrt'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mingw-make
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: x64-mingw-ucrt
 authors:
 - ParadoxV5
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -17,12 +17,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE.txt
 - README.md
 - bin/make
 - lib/mingw-make.rb
 - lib/mingw-make/mkmf.rb
+- lib/mingw-make/rbconfig-patch.rb
 - lib/rubygems_plugin.rb
 - mingw-make.gemspec
 homepage: https://github.com/ParadoxV5/ruby-mingw-make
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby from RubyInstaller2 for Windows without DevKit (MSYS2)
 - UCRT MinGW
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Patches that enable Windows Ruby to install C extension gems with MinGW without

data/Gemfile

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-source 'https://rubygems.org'
-gemspec