mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) b8386f7f7f
:
Prepend DebugSystem to VCS class only
And revert 24e5f1c982
, pepending to
Kernel did not affect the top level methods before 3.0.
---
tool/lib/vcs.rb | 3 ---
tool/make-snapshot | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
This commit is contained in:
parent
a4d2e48c73
commit
80c180df76
3 changed files with 3 additions and 6 deletions
|
@ -52,9 +52,6 @@ module DebugSystem
|
|||
ret
|
||||
end
|
||||
end
|
||||
module Kernel
|
||||
prepend(DebugSystem)
|
||||
end
|
||||
|
||||
class VCS
|
||||
prepend(DebugSystem) if defined?(DebugSystem)
|
||||
|
|
|
@ -52,7 +52,7 @@ PACKAGES = {
|
|||
"zip" => %w".zip zip -Xqr",
|
||||
}
|
||||
DEFAULT_PACKAGES = PACKAGES.keys - ["tar"]
|
||||
if !$no7z and system("7z", out: IO::NULL, exception: false)
|
||||
if !$no7z and system("7z", out: IO::NULL)
|
||||
PACKAGES["gzip"] = %w".tar.gz 7z a dummy -tgzip -mx -so"
|
||||
PACKAGES["zip"] = %w".zip 7z a -tzip -l -mx -mtc=off" << {out: IO::NULL}
|
||||
elsif gzip = ENV.delete("GZIP")
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
|
||||
#define RUBY_VERSION_TEENY 3
|
||||
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
|
||||
#define RUBY_PATCHLEVEL 120
|
||||
#define RUBY_PATCHLEVEL 121
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2021
|
||||
#define RUBY_RELEASE_MONTH 8
|
||||
#define RUBY_RELEASE_DAY 1
|
||||
#define RUBY_RELEASE_DAY 4
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue