Skip to content

Commit

Permalink
Fix the rake build command, ruby 3.2 compat
Browse files Browse the repository at this point in the history
  • Loading branch information
AndiIdogawa committed May 16, 2023
1 parent 1e160f1 commit a7e8a7e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ GEM
rake (13.0.6)

PLATFORMS
x64-mingw-ucrt
x86_64-linux

DEPENDENCIES
Expand Down
1 change: 1 addition & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(The MIT License)

Copyright (c) 2009-2020 Lars Christensen
Copyright (c) 2020-2023 The OCRAN Committers Team

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end
spec.urls.each { |key, url| url.chomp! }

task :build_stub do
sh "bash -c 'make -C src'"
sh "ridk exec bash -c 'make -C src'"
cp "src/stub.exe", "share/ocran/stub.exe"
cp "src/stubw.exe", "share/ocran/stubw.exe"
cp "src/edicon.exe", "share/ocran/edicon.exe"
Expand All @@ -38,7 +38,7 @@ end

task :release_standalone => standalone_zip do
load "bin/ocran"
sh "rubyforge add_release ocran ocran-standalone #{Ocran::VERSION} #{standalone_zip}"
#sh "rubyforge add_release ocran ocran-standalone #{Ocran::VERSION} #{standalone_zip}"
end

file "bin/ocransa.rb" => ["bin/ocran", "share/ocran/stub.exe", "share/ocran/stubw.exe", "share/ocran/lzma.exe", "share/ocran/edicon.exe"] do
Expand Down
4 changes: 4 additions & 0 deletions bin/ocran
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,10 @@ EOF
# Store the currently loaded files (before we require rbconfig for
# our own use).
features = $LOADED_FEATURES.map { |feature| Pathname(feature) }

# Since https://github.com/rubygems/rubygems/commit/cad4cf16cf8fcc637d9da643ef97cf0be2ed63cb
# rubygems/core_ext/kernel_require.rb is evaled and thus missing in $LOADED_FEATURES, so we can't find it and need to add it manually
features.push(Pathname("rubygems/core_ext/kernel_require.rb"))

# Find gemspecs to include
if defined?(Gem)
Expand Down
Binary file removed share/ocra/lzma.exe
Binary file not shown.

0 comments on commit a7e8a7e

Please sign in to comment.