First pass at a mingw platform

rubygems · Oct 27, 2010 · 6c9c2e8 · 6c9c2e8
1 parent 5ef9342
commit 6c9c2e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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