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

ruby-changes:16848

From: naruse <ko1@a...>
Date: Tue, 3 Aug 2010 14:48:22 +0900 (JST)
Subject: [ruby-changes:16848] Ruby:r28843 (trunk): * ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.

naruse	2010-08-03 14:48:05 +0900 (Tue, 03 Aug 2010)

  New Revision: 28843

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

  Log:
    * ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.
    
    * spec/default.mspec: ditto.
    
    * template/Doxyfile.tmpl: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb
    trunk/spec/default.mspec
    trunk/template/Doxyfile.tmpl

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28842)
+++ ChangeLog	(revision 28843)
@@ -1,3 +1,11 @@
+Tue Aug  3 14:42:12 2010  NARUSE, Yui  <naruse@r...>
+
+	* ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.
+
+	* spec/default.mspec: ditto.
+
+	* template/Doxyfile.tmpl: ditto.
+
 Tue Aug  3 14:19:42 2010  NAKAMURA Usaku  <usa@r...>
 
 	* lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence
Index: spec/default.mspec
===================================================================
--- spec/default.mspec	(revision 28842)
+++ spec/default.mspec	(revision 28843)
@@ -16,7 +16,6 @@
     -I#{srcdir}/lib
     -I#{srcdir}/#{config['EXTOUT']}/common
     -I#{srcdir}/-
-    -r#{srcdir}/ext/purelib.rb
     #{srcdir}/tool/runruby.rb --extout=#{config['EXTOUT']}
   ]
 end
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 28842)
+++ ext/extmk.rb	(revision 28843)
@@ -352,7 +352,6 @@
   $ruby << " -I'$(top_srcdir)/lib'"
   $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
   ENV["RUBYLIB"] = "-"
-  ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
 end
 $mflags << "ruby=#$ruby"
 
Index: template/Doxyfile.tmpl
===================================================================
--- template/Doxyfile.tmpl	(revision 28842)
+++ template/Doxyfile.tmpl	(revision 28843)
@@ -9,7 +9,7 @@
 srcdir ||= File.dirname(File.dirname(__FILE__))
 load 'rbconfig.rb'
 unless miniruby
-  miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
+  miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./-'
   RbConfig.expand(miniruby, RbConfig::CONFIG.merge("srcdir"=>srcdir))
 end
 dot = RbConfig::CONFIG['DOT'] || ""

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

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