diff options
| author | Lars Kanis <lars@greiz-reinsdorf.de> | 2022-01-17 22:24:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 06:24:20 +0900 |
| commit | 2b67583b52a837304e6d14ca28bcd6522db54970 (patch) | |
| tree | 317fa4d8eb06d12e15dd7a9914502c2a77daaec9 | |
| parent | a04f7d4bdf574a4c05c654ee4dbebfd49eac548c (diff) | |
| download | rake-compiler-2b67583b52a837304e6d14ca28bcd6522db54970.tar.gz | |
Set correct `required_ruby_version` when some `RUBY_CC_VERSION`s are missing (#199)
The required_ruby_version was set twice, although one in define_native_tasks is enough.
Fixes #198
| -rw-r--r-- | lib/rake/extensiontask.rb | 3 | ||||
| -rw-r--r-- | spec/lib/rake/extensiontask_spec.rb | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/rake/extensiontask.rb b/lib/rake/extensiontask.rb index 5395b3d..f4d751f 100644 --- a/lib/rake/extensiontask.rb +++ b/lib/rake/extensiontask.rb @@ -377,9 +377,6 @@ Java extension should be preferred. @lib_dir = "#{@lib_dir}/#{$1}" end - # Update cross compiled platform/version combinations - @ruby_versions_per_platform[for_platform] << version - define_cross_platform_tasks_with_version(for_platform, version) # restore lib_dir diff --git a/spec/lib/rake/extensiontask_spec.rb b/spec/lib/rake/extensiontask_spec.rb index 47dad7d..b719f52 100644 --- a/spec/lib/rake/extensiontask_spec.rb +++ b/spec/lib/rake/extensiontask_spec.rb @@ -456,14 +456,17 @@ describe Rake::ExtensionTask do it "should set required_ruby_version from RUBY_CC_VERSION, set platform, clear extensions but keep metadata" do platforms = ["x86-mingw32", "x64-mingw32"] - ruby_cc_versions = ["1.8.6", "2.1.10", "2.2.6", "2.3.3", "2.10.1"] + ruby_cc_versions = ["1.8.6", "2.1.10", "2.2.6", "2.3.3", "2.10.1", "2.11.0"] ENV["RUBY_CC_VERSION"] = ruby_cc_versions.join(":") config = Hash.new ruby_cc_versions.each do |ruby_cc_version| platforms.each do |platform| + unless platform == "x64-mingw32" && ruby_cc_version == "2.11.0" + rbconf = "/rubies/#{ruby_cc_version}/rbconfig.rb" + end allow(config).to receive(:[]). with("rbconfig-#{platform}-#{ruby_cc_version}"). - and_return("/rubies/#{ruby_cc_version}/rbconfig.rb") + and_return(rbconf) end end allow(YAML).to receive(:load_file).and_return(config) @@ -490,7 +493,7 @@ describe Rake::ExtensionTask do end expected_required_ruby_versions = [ - Gem::Requirement.new([">= 1.8", "< 2.11.dev"]), + Gem::Requirement.new([">= 1.8", "< 2.12.dev"]), Gem::Requirement.new([">= 1.8", "< 2.11.dev"]), ] cross_specs.collect(&:required_ruby_version).should == expected_required_ruby_versions |