Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ri-msys/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RubyPackage < RubyInstaller::Build::Openstruct
self.rubyver, self.pkgrel = packagever.split("-", 2)
self.packagename = "rubyinstaller-devkit"
self.rubyver2 = packagever=='head' ? "4.1" : rubyver[ /^\d+\.\d+/ ]
self.rubylibver = packagever=='head' ? "#{rubyver2}.0+4" : "#{rubyver2}.0"
self.rubylibver = packagever=='head' ? "#{rubyver2}.0+5" : "#{rubyver2}.0"

case arch
when 'x64-ucrt'
Expand Down
2 changes: 1 addition & 1 deletion packages/ri/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RubyPackage < RubyInstaller::Build::Openstruct
self.rubyver, self.pkgrel = packagever.split("-", 2)
self.packagename = "rubyinstaller"
self.rubyver2 = packagever=='head' ? "4.1" : rubyver[ /^\d+\.\d+/ ]
self.rubylibver = packagever=='head' ? "#{rubyver2}.0+4" : "#{rubyver2}.0"
self.rubylibver = packagever=='head' ? "#{rubyver2}.0+5" : "#{rubyver2}.0"

case arch
when 'x64-ucrt'
Expand Down
2 changes: 1 addition & 1 deletion recipes/sandbox/50-gather-sandbox-files.rake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
self.sandboxfile_listfile = "#{thisdir}/rubyinstaller-#{package.rubyver}.files"
self.sandboxfile_arch_listfile = "#{thisdir}/rubyinstaller-#{package.rubyver}-#{package.arch}.files"
sandboxfiles_rel = File.readlines(ovl_expand_file(sandboxfile_listfile)) + File.readlines(ovl_expand_file(sandboxfile_arch_listfile))
sandboxfiles_rel = sandboxfiles_rel.map{|path| path.chomp }
sandboxfiles_rel = sandboxfiles_rel.map{|path| path.chomp.gsub("%{rubylibver}", package.rubylibver) }
sandboxfiles_rel += import_files.values
self.sandboxfiles += sandboxfiles_rel.map{|path| File.join(sandboxdir, path)}
10 changes: 5 additions & 5 deletions recipes/sandbox/rubyinstaller-head.files
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ bin/libyaml-0-2.dll
bin/ruby.exe
bin/rubyw.exe
bin/zlib1.dll
include/ruby-4.1.0+4
include/ruby-%{rubylibver}
lib/pkgconfig/ruby-4.1.pc
lib/ruby/4.1.0+4
lib/ruby/gems/4.1.0+4
lib/ruby/site_ruby/4.1.0+4
lib/ruby/vendor_ruby/4.1.0+4
lib/ruby/%{rubylibver}
lib/ruby/gems/%{rubylibver}
lib/ruby/site_ruby/%{rubylibver}
lib/ruby/vendor_ruby/%{rubylibver}
share/doc/ruby/html/
share/ri/
Loading