1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/mkext.rb: remove purelib, fixes a bug in r28440, r28441.

Browse Source 
* spec/default.mspec: ditto.

* template/Doxyfile.tmpl: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-08-03 05:48:05 +00:00
parent 2fc40194d2
commit b5dc2576cc
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Aug 3 14:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org> Tue Aug 3 14:19:42 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence * lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence

1
ext/extmk.rb
View File

@ -352,7 +352,6 @@ unless CROSS_COMPILING
$ruby << " -I'$(top_srcdir)/lib'" $ruby << " -I'$(top_srcdir)/lib'"
$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
ENV["RUBYLIB"] = "-" ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
end end
$mflags << "ruby=#$ruby" $mflags << "ruby=#$ruby"

1
spec/default.mspec
View File

@ -16,7 +16,6 @@ class MSpecScript
-I#{srcdir}/lib -I#{srcdir}/lib
-I#{srcdir}/#{config['EXTOUT']}/common -I#{srcdir}/#{config['EXTOUT']}/common
-I#{srcdir}/- -I#{srcdir}/-
-r#{srcdir}/ext/purelib.rb
#{srcdir}/tool/runruby.rb --extout=#{config['EXTOUT']} #{srcdir}/tool/runruby.rb --extout=#{config['EXTOUT']}
] ]
end end

2
template/Doxyfile.tmpl
View File

@ -9,7 +9,7 @@ end
srcdir ||= File.dirname(File.dirname(__FILE__)) srcdir ||= File.dirname(File.dirname(__FILE__))
load 'rbconfig.rb' load 'rbconfig.rb'
unless miniruby 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)) RbConfig.expand(miniruby, RbConfig::CONFIG.merge("srcdir"=>srcdir))
end end
dot = RbConfig::CONFIG['DOT'] || "" dot = RbConfig::CONFIG['DOT'] || ""