drbrain	2008-07-01 03:46:21 +0900 (Tue, 01 Jul 2008)

  New Revision: 17754

  Modified files:
    trunk/ChangeLog
    trunk/runruby.rb
    trunk/test/rubygems/test_gem_ext_configure_builder.rb

  Log:
    RubyGems patches by Yusuke ENDOH [ruby-core:17442], [ruby-core:17444].


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

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rubygems/test_gem_ext_configure_builder.rb?r1=17754&r2=17753&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/runruby.rb?r1=17754&r2=17753&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17754&r2=17753&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17753)
+++ ChangeLog	(revision 17754)
@@ -1,3 +1,11 @@
+Tue Jul  1 03:28:16 2008  Eric Hodel  <drbrain@s...>
+
+	* test/rubygems/test_ext_configure_builder.rb:  Apply locale-free
+	patch by Yusuke ENDOH.  [ruby-core:17444].
+
+	* runruby.rb:  Set ENV['rake'].  Patch by Yusuke ENDOH
+	[ruby-core:17442].
+
 Tue Jul  1 01:07:17 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
Index: runruby.rb
===================================================================
--- runruby.rb	(revision 17753)
+++ runruby.rb	(revision 17754)
@@ -46,6 +46,7 @@
 config["bindir"] = abs_archdir
 ENV["RUBY"] = File.expand_path(ruby)
 ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
+ENV["rake"] = ENV["RUBY"] + " " + File.join(abs_archdir, "bin", "rake")
 
 if pure
   libs << File.expand_path("ext", srcdir) << "-"
Index: test/rubygems/test_gem_ext_configure_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_configure_builder.rb	(revision 17753)
+++ test/rubygems/test_gem_ext_configure_builder.rb	(revision 17754)
@@ -47,9 +47,9 @@
       end
     end
 
-    shell_error_msg = %r{(\./configure: No such file or directory)|(Can't open \./configure)}
+    shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure)}
     sh_prefix_configure = "sh ./configure --prefix="
-    
+
     expected = %r(configure failed:
 
 #{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path}

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