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

* spec/default.mspec: supports that the build directory != srcdir.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-10-31 03:31:09 +00:00
parent b1c07ee240
commit 30887efb8a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Oct 31 12:27:52 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* spec/default.mspec: supports that the build directory != srcdir.
Fri Oct 31 11:35:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Oct 31 11:35:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_set_default_internal): no alias "internal" if * encoding.c (rb_enc_set_default_internal): no alias "internal" if

9
spec/default.mspec
View File

@ -7,11 +7,14 @@ class MSpecScript
spec/rubyspec/1.9/library spec/rubyspec/1.9/library
] ]
srcdir = File.expand_path(File.join(File.dirname(__FILE__), '..')) builddir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
config = proc{|name| `#{srcdir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} srcdir = ENV['SRCDIR']
srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i]
srcdir ||= builddir
config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`}
# The default implementation to run the specs. # The default implementation to run the specs.
set :target, File.join(srcdir, "miniruby#{config['exeext']}") set :target, File.join(builddir, "miniruby#{config['exeext']}")
set :flags, %W[ set :flags, %W[
-I#{srcdir}/lib -I#{srcdir}/lib
-I#{srcdir}/#{config['EXTOUT']}/common -I#{srcdir}/#{config['EXTOUT']}/common