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

merge -r 12332:12336

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2007-05-22 21:37:36 +00:00
parent d53a933fdf
commit 46fa180ea0
6 changed files with 25 additions and 3 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]
Wed May 23 06:14:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed May 23 06:14:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (move_to_next_entry): loc also must move forward. * win32/win32.c (move_to_next_entry): loc also must move forward.

4
ext/extmk.rb
View file

@ -324,7 +324,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)/$(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)}

3
ext/purelib.rb Normal file
View file

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

3
lib/mkmf.rb
View file

@ -1052,6 +1052,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

10
runruby.rb
View file

@ -41,7 +41,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 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)
@ -56,4 +58,8 @@ if File.file?(libruby_so)
end end
end end
exec ruby, *ARGV cmd = [ruby]
cmd << "-rpurelib.rb" if pure
cmd.concat(ARGV)
cmd.unshift(*debugger) if debugger
exec(*cmd)

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_RELEASE_DATE "2007-05-23"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070523 #define RUBY_RELEASE_CODE 20070523
#define RUBY_PATCHLEVEL 24 #define RUBY_PATCHLEVEL 25
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8