[前][次][番号順一覧][スレッド一覧]

ruby-changes:35692

From: shirosaki <ko1@a...>
Date: Fri, 3 Oct 2014 23:27:39 +0900 (JST)
Subject: [ruby-changes:35692] shirosaki:r47774 (trunk): fake.rb.in: fix make install failure

shirosaki	2014-10-03 23:27:31 +0900 (Fri, 03 Oct 2014)

  New Revision: 47774

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47774

  Log:
    fake.rb.in: fix make install failure
    
    * template/fake.rb.in: fix make install failure due to MSYS path
      with mingw on MSYS environment.
      [ruby-core:64965] [Bug #10230]

  Modified files:
    trunk/ChangeLog
    trunk/template/fake.rb.in
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47773)
+++ ChangeLog	(revision 47774)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Oct  3 23:22:23 2014  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* template/fake.rb.in: fix make install failure due to MSYS path
+	  with mingw on MSYS environment.
+	  [ruby-core:64965] [Bug #10230]
+
 Fri Oct  3 21:02:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* test/ruby/test_io.rb (TestIO#test_advise): avoid to infinite loop.
Index: template/fake.rb.in
===================================================================
--- template/fake.rb.in	(revision 47773)
+++ template/fake.rb.in	(revision 47774)
@@ -19,6 +19,10 @@ class Object https://github.com/ruby/ruby/blob/trunk/template/fake.rb.in#L19
 end
 builddir = File.dirname(__FILE__)
 top_srcdir = "@abs_top_srcdir@"
+if /mingw/ =~ RUBY_PLATFORM
+  # convert MSYS path to Windows path
+  top_srcdir.sub!(/\A\/([a-z])\//, '\\1:/')
+end
 $:.unshift(File.expand_path(builddir))
 fake = File.join(top_srcdir, "tool/fake.rb")
 eval(File.read(fake), nil, fake)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]