kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/extmk.rb, ext/purelib.rb, lib/mkmf.rb, runruby.rb: clear default

Browse source 
load path to get rid of load pre-installed extensions/libraries.
  [ruby-core:11017]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-05-22 20:48:34 +00:00
parent 64bffee8d6
commit 80a0e2f753
6 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed May 23 05:49:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb, ext/purelib.rb, lib/mkmf.rb, runruby.rb: clear default
load path to get rid of load pre-installed extensions/libraries.
[ruby-core:11017]
Tue May 22 16:37:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Tue May 22 16:37:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (set_arg0): support RSTRING_LEN on HP-UX. a patch from * ruby.c (set_arg0): support RSTRING_LEN on HP-UX. a patch from

5
ext/extmk.rb
View file

@ -323,8 +323,11 @@ else
$ruby = '$(topdir)/miniruby' + EXEEXT $ruby = '$(topdir)/miniruby' + EXEEXT
end end
$ruby << " -I'$(topdir)' -I'$(hdrdir)/lib'" $ruby << " -I'$(topdir)' -I'$(hdrdir)/lib'"
$ruby << " -I'#{$extout}'" if $extout $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
$ruby << " -I'$(hdrdir)/ext' -rpurelib.rb"
$config_h = '$(topdir)/config.h' $config_h = '$(topdir)/config.h'
ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-rpurelib.rb"
MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)} MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}

6
ext/purelib.rb Normal file
View file

@ -0,0 +1,6 @@
if nul = $:.index("-")
$:[nul..-1] = ["."]
end
if nul = $:.index("-")
$:[nul..-1] = ["."]
end

3
lib/mkmf.rb
View file

@ -1059,6 +1059,9 @@ topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'} hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
} }
if $extmk
mk << "RUBYLIB = -\nRUBYOPT = -rpurelib.rb\n"
end
if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1] if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
mk << "\nDESTDIR = #{destdir}\n" mk << "\nDESTDIR = #{destdir}\n"
end end

12
runruby.rb
View file

@ -47,7 +47,9 @@ config["bindir"] = abs_archdir
ENV["RUBY"] = File.expand_path(ruby) ENV["RUBY"] = File.expand_path(ruby)
ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR) ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
if !pure and e = ENV["RUBYLIB"] if pure
libs << File.expand_path("ext", srcdir) << "-"
elsif e = ENV["RUBYLIB"]
libs |= e.split(File::PATH_SEPARATOR) libs |= e.split(File::PATH_SEPARATOR)
end end
ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR) ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
@ -61,15 +63,9 @@ if File.file?(libruby_so)
ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ') ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ')
end end
end end
begin
open("puretest.rb", IO::EXCL|IO::CREAT|IO::WRONLY) do |f|
f.puts('$LOAD_PATH.replace(ENV["RUBYLIB"].split(File::PATH_SEPARATOR))')
end
rescue Errno::EEXIST
end
cmd = [ruby] cmd = [ruby]
cmd << "-rpuretest.rb" if pure cmd << "-rpurelib.rb" if pure
cmd.concat(ARGV) cmd.concat(ARGV)
cmd.unshift(*debugger) if debugger cmd.unshift(*debugger) if debugger
exec(*cmd) exec(*cmd)

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-05-22" #define RUBY_RELEASE_DATE "2007-05-23"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070522 #define RUBY_RELEASE_CODE 20070523
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 22 #define RUBY_RELEASE_DAY 23
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];