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

* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.

Browse source 
[ruby-core:16642]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-08 07:41:23 +00:00
parent 714cd205cc
commit f3ad9bf9b3
6 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu May 8 16:41:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
[ruby-core:16642]
Thu May 8 16:00:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Thu May 8 16:00:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): ! and ? at the bottom are no longer part * parse.y (parser_yylex): ! and ? at the bottom are no longer part

3
Makefile.in
View file

@ -39,6 +39,9 @@ empty =
OUTFLAG = @OUTFLAG@$(empty) OUTFLAG = @OUTFLAG@$(empty)
COUTFLAG = @COUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty)
CFLAGS = @CFLAGS@ @ARCH_FLAG@ CFLAGS = @CFLAGS@ @ARCH_FLAG@
cflags = @cflags@
optflags = @optflags@
debugflags = @debugflags@
XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@ XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@

6
common.mk
View file

@ -4,7 +4,8 @@ dll: $(LIBRUBY_SO)
.SUFFIXES: .inc .SUFFIXES: .inc
RUBYOPT = RUBYLIB = -
RUBYOPT = -rpurelib.rb
STATIC_RUBY = static-ruby STATIC_RUBY = static-ruby
@ -114,6 +115,9 @@ all: $(MKFILES) $(PREP) incs $(RBCONFIG) $(LIBRUBY) encs
@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
prog: $(PROGRAM) $(WPROGRAM) prog: $(PROGRAM) $(WPROGRAM)
loadpath: $(PREP)
$(MINIRUBY) -e 'p $$:'
$(PREP): $(MKFILES) $(PREP): $(MKFILES)
miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)

2
configure.in
View file

@ -1488,6 +1488,8 @@ if test x"$cross_compiling" = xyes; then
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/$(arch) -I$(EXTOUT)/common'
MINIRUBY="$MINIRUBY"' -I./- -I$(srcdir)/ext -rpurelib.rb'
PREP='miniruby$(EXEEXT)' PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi fi

2
ext/extmk.rb
View file

@ -348,7 +348,7 @@ $ruby << " -I'$(topdir)'"
unless CROSS_COMPILING 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
$ruby << " -I'$(top_srcdir)/ext' -rpurelib.rb" $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
ENV["RUBYLIB"] = "-" ENV["RUBYLIB"] = "-"
ENV["RUBYOPT"] = "-rpurelib.rb" ENV["RUBYOPT"] = "-rpurelib.rb"
end end

2
ext/purelib.rb
View file

@ -1,3 +1,3 @@
if nul = $:.index("-") if nul = $:.find_index {|path| /\A(?:\.\/)*-\z/ =~ path}
$:[nul..-1] = ["."] $:[nul..-1] = ["."]
end end