From 6c9c2e8cb92d48e223ce6e53264a046ab1d177f4 Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Wed, 8 Sep 2010 18:01:15 -0700 Subject: [PATCH] First pass at a mingw platform --- lib/bundler/dependency.rb | 9 +++++++-- lib/bundler/resolver.rb | 2 +- lib/bundler/rubygems_ext.rb | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 358dfd5abc2..38f4e6ea0f3 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -16,7 +16,8 @@ class Dependency < Gem::Dependency :mri_18 => Gem::Platform::RUBY, :mri_19 => Gem::Platform::RUBY, :jruby => Gem::Platform::JAVA, - :mswin => Gem::Platform::MSWIN + :mswin => Gem::Platform::MSWIN, + :mingw => Gem::Platform::MINGW }.freeze def initialize(name, version, options = {}, &blk) @@ -108,7 +109,11 @@ def jruby? end def mswin? - # w0t? + Bundler::WINDOWS + end + + def mingw? + Bundler::WINDOWS end end end diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index cf311542c67..41aa9540db7 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -24,7 +24,7 @@ class Resolver ALL = [ Gem::Platform::RUBY, Gem::Platform::JAVA, Gem::Platform::MSWIN, - Gem::Platform::MING] + Gem::Platform::MINGW ] class SpecGroup < Array include GemHelpers diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 30f7ba04bcb..605b5577643 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -121,7 +121,7 @@ def to_lock class Platform JAVA = Gem::Platform.new('java') MSWIN = Gem::Platform.new('mswin32') - MING = Gem::Platform.new('x86-mingw32') + MINGW = Gem::Platform.new('mingw32') def hash @cpu.hash ^ @os.hash ^ @version.hash