diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-18 10:49:20 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-18 10:49:20 +0000 |
| commit | 006e8d2e71375e5a9554115bc5771447bc44ec27 (patch) | |
| tree | 5e97be4724c685c7b7dec065f48e493f60f75d81 | |
| parent | c223709c3b95127e7a0c0b3812ea2e89ecb8646f (diff) | |
* instruby.rb, rubytest.rb: do not depend on srcdir.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | instruby.rb | 5 | ||||
| -rw-r--r-- | rubytest.rb | 3 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Thu Mar 18 19:47:44 2004 WATANABE Hirofumi <[email protected]> + + * instruby.rb, rubytest.rb: do not depend on srcdir. + Thu Mar 18 18:50:06 2004 Nobuyoshi Nakada <[email protected]> * mkconfig.rb: no longer embed srcdir and compile_dir into diff --git a/instruby.rb b/instruby.rb index 146bb2d4f3..c4ab168d6b 100644 --- a/instruby.rb +++ b/instruby.rb @@ -3,7 +3,8 @@ load "./rbconfig.rb" include Config -$:.unshift File.join(CONFIG["srcdir"], "lib") +srcdir = File.dirname(__FILE__) +$:.unshift File.join(srcdir, "lib") require 'fileutils' require 'shellwords' require 'optparse' @@ -123,7 +124,7 @@ if dll == lib and dll != arc end end -Dir.chdir CONFIG["srcdir"] +Dir.chdir srcdir ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name) if File::ALT_SEPARATOR diff --git a/rubytest.rb b/rubytest.rb index 6f717a2b60..d664bcf3ae 100644 --- a/rubytest.rb +++ b/rubytest.rb @@ -34,7 +34,8 @@ end $stderr.reopen($stdout) error = '' -`./#{CONFIG["ruby_install_name"]}#{CONFIG["EXEEXT"]} -I#{CONFIG["srcdir"]}/lib #{CONFIG["srcdir"]}/sample/test.rb`.each do |line| +srcdir = File.dirname(__FILE__) +`./#{CONFIG["ruby_install_name"]}#{CONFIG["EXEEXT"]} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line| if line =~ /^end of test/ print "test succeeded\n" exit 0 |