Skip to content

Commit

Permalink
Add ruby-3.4.1 target and remove x64-msvcrt
Browse files Browse the repository at this point in the history
x64-msvcrt was used in ruby<3.1 which is EOL now.
  • Loading branch information
larskanis committed Dec 26, 2024
1 parent c948ee1 commit 46c84b5
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 18 deletions.
6 changes: 3 additions & 3 deletions packages/ri-msys/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ end
ovl_glob('recipes/*/task.rake').each{|f| load(ovl_expand_file(f)) }

ruby_arch_packages = %w[x64-ucrt].map do |arch|
%w[3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
%w[3.1.6-1 3.2.6-1 3.3.6-2 3.4.1-1 head].map do |packagever|
RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze
end
end
ruby_arch_packages += %w[x64-msvcrt x86-msvcrt].map do |arch|
%w[3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
ruby_arch_packages += %w[x86-msvcrt].map do |arch|
%w[3.1.6-1 3.2.6-1 3.3.6-2 3.4.1-1 head].map do |packagever|
RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze
end
end
Expand Down
6 changes: 3 additions & 3 deletions packages/ri/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ end
ovl_glob('recipes/*/task.rake').each{|f| load(ovl_expand_file(f)) }

ruby_arch_packages = %w[x64-ucrt].map do |arch|
%w[3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
%w[3.1.6-1 3.2.6-1 3.3.6-2 3.4.1-1 head].map do |packagever|
RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze
end
end
ruby_arch_packages += %w[x64-msvcrt x86-msvcrt].map do |arch|
%w[3.1.6-1 3.2.6-1 3.3.6-2 head].map do |packagever|
ruby_arch_packages += %w[x86-msvcrt].map do |arch|
%w[3.1.6-1 3.2.6-1 3.3.6-2 3.4.1-1 head].map do |packagever|
RubyPackage.new( packagever: packagever, arch: arch, rootdir: __dir__ ).freeze
end
end
Expand Down
5 changes: 0 additions & 5 deletions recipes/sandbox/rubyinstaller-3.1.6-x64-msvcrt.files

This file was deleted.

5 changes: 0 additions & 5 deletions recipes/sandbox/rubyinstaller-3.3.6-x64-msvcrt.files

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bin/libcrypto-3-x64.dll
bin/libgcc_s_seh-1.dll
bin/libssl-3-x64.dll
bin/x64-msvcrt-ruby320.dll
lib/libx64-msvcrt-ruby320.dll.a
bin/x64-ucrt-ruby340.dll
lib/libx64-ucrt-ruby340.dll.a
5 changes: 5 additions & 0 deletions recipes/sandbox/rubyinstaller-3.4.1-x86-msvcrt.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
bin/libcrypto-3.dll
bin/libgcc_s_dw2-1.dll
bin/libssl-3.dll
bin/msvcrt-ruby340.dll
lib/libmsvcrt-ruby340.dll.a
37 changes: 37 additions & 0 deletions recipes/sandbox/rubyinstaller-3.4.1.files
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
bin/bundle
bin/bundle.bat
bin/bundler
bin/bundler.bat
bin/erb
bin/erb.bat
bin/gem
bin/gem.cmd
bin/irb
bin/irb.bat
bin/racc
bin/racc.bat
bin/rake
bin/rake.bat
bin/rbs
bin/rbs.bat
bin/rdoc
bin/rdoc.bat
bin/ri
bin/ri.bat
bin/typeprof
bin/typeprof.bat
bin/libffi-8.dll
bin/libgmp-10.dll
bin/libwinpthread-1.dll
bin/libyaml-0-2.dll
bin/ruby.exe
bin/rubyw.exe
bin/zlib1.dll
include/ruby-3.4.0
lib/pkgconfig/ruby-3.4.pc
lib/ruby/3.4.0
lib/ruby/gems/3.4.0
lib/ruby/site_ruby/3.4.0
lib/ruby/vendor_ruby/3.4.0
share/doc/ruby/html/
share/ri/

0 comments on commit 46c84b5

Please sign in to comment.