nobu	2009-01-08 17:32:17 +0900 (Thu, 08 Jan 2009)

  New Revision: 21387

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

  Log:
    * instruby.rb: should not depend on a library which does not exist
      in 1.8.

  Modified files:
    trunk/ChangeLog
    trunk/instruby.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21386)
+++ ChangeLog	(revision 21387)
@@ -1,3 +1,8 @@
+Thu Jan  8 17:32:51 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* instruby.rb: should not depend on a library which does not exist
+	  in 1.8.
+
 Thu Jan  8 07:52:55 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/socket.c (init_unix_addrinfo): don't return a value.
Index: instruby.rb
===================================================================
--- instruby.rb	(revision 21386)
+++ instruby.rb	(revision 21387)
@@ -284,8 +284,7 @@
   if $rdocdir
     puts "installing rdoc"
 
-    ridatadir = RDoc::RI::Paths::SYSDIR
-    Config.expand(ridatadir)
+    ridatadir = File.join(CONFIG['datadir'], "ri", CONFIG['ruby_version'], "system")
     makedirs [ridatadir]
     install_recursive($rdocdir, ridatadir, :mode => $data_mode)
   end
@@ -342,10 +341,10 @@
 :endofruby
 EOF
       when "cmd"
-        "#{<<EOH}#{shebang}#{body}"
+        "#{<<"/EOH"}#{shebang}#{body}"
 @"%~dp0#{ruby_install_name}" -x "%~f0" %*
 @exit /b %ERRORLEVEL%
-EOH
+/EOH
       else
         shebang + body
       end
@@ -411,7 +410,11 @@
 install?(:local, :comm, :gem) do
   puts "creating default gem directories"
 
-  directories = %w[cache doc gems specifications]
+  directories = open(File.join(srcdir, "lib/rubygems.rb")) do |f|
+    if f.grep(/^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/)
+      break $1.split
+    end
+  end
   gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
   makedirs directories.collect {|dir| File.join(gpath, dir)}
 end

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