rails / rails fork watch download tarball
public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Search Repo: 
Merge [6344] from trunk. Check for MinGW when testing for Windows 
platform. References #2982.

git-svn-id: 
http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6345 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
jeremy (author)
Tue Mar 06 01:24:14 -0800 2007
commit  a9ed24c2dde18e6f6b86af834c3513f62883b645
tree    05525751905c243148e08e36962db8c486270417
parent  b1e1088ab951fe7b0ae890a919686d88d7a6290e
0
railties/CHANGELOG 
...
1
2
 
 
3
 
4
5
6
 
...
1
2
3
4
5
6
7
8
9
 
0
@@ -1,6 +1,9 @@
0
 *SVN*
0
 
0
+* Windows: include MinGW in RUBY_PLATFORM check.  #2982 [okkez000@gmail.com, Kaspar Schiess]
0
+
0
 * Stop swallowing errors during rake test [Koz]
0
+
0
 
0
 *1.2.2* (February 5th, 2007)
0
 
0
railties/environments/boot.rb 
...
3
4
5
6
 
7
8
9
 
...
3
4
5
 
6
7
8
9
 
0
@@ -3,7 +3,7 @@
0
 unless defined?(RAILS_ROOT)
0
   root_path = File.join(File.dirname(__FILE__), '..')
0
 
0
-  unless RUBY_PLATFORM =~ /mswin32/
0
+  unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
0
     require 'pathname'
0
     root_path = Pathname.new(root_path).cleanpath(true).to_s
0
   end
0
railties/lib/commands/console.rb 
...
1
 
2
3
4
 
...
 
1
2
3
4
 
0
@@ -1,4 +1,4 @@
0
-irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
0
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
0
 
0
 require 'optparse'
0
 options = { :sandbox => false, :irb => irb }
0
railties/lib/commands/process/inspector.rb 
...
1
2
3
 
4
5
6
 
...
1
2
 
3
4
5
6
 
0
@@ -1,6 +1,6 @@
0
 require 'optparse'
0
 
0
-if RUBY_PLATFORM =~ /mswin32/ then abort("Inspector is only for Unix") end
0
+if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Inspector is only for Unix") end
0
 
0
 OPTIONS = {
0
   :pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
0
railties/lib/commands/process/reaper.rb 
...
2
3
4
5
 
6
7
8
 
...
2
3
4
 
5
6
7
8
 
0
@@ -2,7 +2,7 @@
0
 require 'net/http'
0
 require 'uri'
0
 
0
-if RUBY_PLATFORM =~ /mswin32/ then abort("Reaper is only for Unix") end
0
+if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Reaper is only for Unix") end
0
 
0
 class Killer
0
   class << self
0
railties/lib/commands/process/spawner.rb 
...
92
93
94
95
 
96
97
98
 
...
92
93
94
 
95
96
97
98
 
0
@@ -92,7 +92,7 @@
0
   else
0
     if defined?(Mongrel)
0
       "mongrel"
0
-    elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
0
+    elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
0
       "fcgi"
0
     end
0
 end
0
railties/lib/commands/server.rb 
...
19
20
21
22
 
23
24
25
 
...
19
20
21
 
22
23
24
25
 
0
@@ -19,7 +19,7 @@
0
   else
0
     if defined?(Mongrel)
0
       "mongrel"
0
-    elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
0
+    elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
0
       "lighttpd"
0
     else
0
       "webrick"
0
railties/lib/rails_generator/generators/applications/app/app_generator.rb 
...
109
110
111
112
 
113
114
115
 
...
109
110
111
 
112
113
114
115
 
0
@@ -109,7 +109,7 @@
0
     end
0
 
0
     def mysql_socket_location
0
-      RUBY_PLATFORM =~ /mswin32/ ? MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } : nil
0
+      MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
0
     end
0
 
0
 
0
railties/lib/tasks/testing.rake 
...
30
31
32
33
 
34
35
36
 
...
30
31
32
 
33
34
35
36
 
0
@@ -30,7 +30,7 @@
0
 module Kernel
0
   def silence_stderr
0
     old_stderr = STDERR.dup
0
-    STDERR.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
0
+    STDERR.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
0
     STDERR.sync = true
0
     yield
0
   ensure

Comments

    No one has commented yet.