Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rake-compiler/rake-compiler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.9.0
Choose a base ref
...
head repository: rake-compiler/rake-compiler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.9.1
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 3, 2013

  1. Restore compatibility with RubyGems platforms 

    In 0.9.0 the support for usage of x86-mingw32 platforms was removed for
cross-compile platforms.

In the wild, several gems use this syntax to indicate the platforms the
gem targets.

Since this is a massive breakage, a workaround need be put in place.

This change restores that functionality and accept also the
RUBY_PLATFORM one (i386-mingw32)
    @luislavena
    luislavena committed Aug 3, 2013

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    298da7d View commit details

  2. Prepare for bugfix release

    @luislavena
    luislavena committed Aug 3, 2013

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    cc2799c View commit details
Showing with 17 additions and 5 deletions.
  1. +6 −0 History.txt
  2. +10 −4 tasks/bin/cross-ruby.rake
  3. +1 −1 tasks/gem.rake
6 changes: 6 additions & 0 deletions History.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
=== 0.9.1 / 2013-08-03

* Bugfixes:
* Restore compatibility with RubyGems platforms for cross-compilation
(i386-mingw32 and x86-mingw32 are the same and supported)

=== 0.9.0 / 2013-08-03

* Enhancements:
14 changes: 10 additions & 4 deletions tasks/bin/cross-ruby.rake
View file
Original file line number Diff line number Diff line change
@@ -179,12 +179,18 @@ task 'update-config' do

files.each do |rbconfig|
version, platform = rbconfig.match(/.*-(\d.\d.\d).*\/([-\w]+)\/rbconfig/)[1,2]
config["rbconfig-#{platform}-#{version}"] = rbconfig
platforms = [platform]

# fake alternate (binary compatible) i386-mswin32-60 platform
if platform == "i386-mingw32"
alt_platform = "i386-mswin32-60"
config["rbconfig-#{alt_platform}-#{version}"] = rbconfig
platform == "i386-mingw32" and
platforms.push "i386-mswin32-60"

platforms.each do |plat|
config["rbconfig-#{plat}-#{version}"] = rbconfig

# also store RubyGems-compatible version
gem_platform = Gem::Platform.new(plat)
config["rbconfig-#{gem_platform}-#{version}"] = rbconfig
end

puts "Found Ruby version #{version} for platform #{platform} (#{rbconfig})"
2 changes: 1 addition & 1 deletion tasks/gem.rake
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ require 'rubygems/package_task'
GEM_SPEC = Gem::Specification.new do |s|
# basic information
s.name = "rake-compiler"
s.version = "0.9.0"
s.version = "0.9.1"
s.platform = Gem::Platform::RUBY

# description and details