yugui	2012-02-18 18:00:02 +0900 (Sat, 18 Feb 2012)

  New Revision: 34676

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

  Log:
    merges r28134 from trunk into ruby_1_9_2.
    --
    Allow bin/* install from dot-dirs. Fixes rvm and multiruby installations.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/tool/rbinstall.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 34675)
+++ ruby_1_9_2/ChangeLog	(revision 34676)
@@ -1,3 +1,8 @@
+Thu Jun  3 05:37:46 2010  Ryan Davis  <ryand-ruby@z...>
+
+	* tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs.
+	  Fixes rvm and multiruby installations.
+
 Thu Oct 27 09:57:56 2011  NARUSE, Yui  <naruse@r...>
 
 	* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 34675)
+++ ruby_1_9_2/version.h	(revision 34676)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 317
+#define RUBY_PATCHLEVEL 318
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/tool/rbinstall.rb
===================================================================
--- ruby_1_9_2/tool/rbinstall.rb	(revision 34675)
+++ ruby_1_9_2/tool/rbinstall.rb	(revision 34676)
@@ -404,7 +404,9 @@
   end
   for src in Dir[File.join(srcdir, "bin/*")]
     next unless File.file?(src)
-    next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
+    s = src.downcase
+    next if %w(old bak orig rej diff patch core).include? File.extname(s)
+    next if /^\.\#|(~|core)$/i =~ File.basename(s)
 
     name = RbConfig.expand(trans[File.basename(src)])
 

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