mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
ruby without current libraries. * common.mk (rdoc): use XRUBY. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25438 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2e5e8fd895
commit
e9af789d35
5 changed files with 17 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
Fri Oct 23 07:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
|
||||
ruby without current libraries.
|
||||
|
||||
* common.mk (rdoc): use XRUBY.
|
||||
|
||||
Fri Oct 23 07:28:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (warnflags): use -Wextra instead of -Wall.
|
||||
|
|
|
@ -75,6 +75,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
|
|||
RUBY = $(RUBY_INSTALL_NAME)
|
||||
MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
|
||||
RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
|
||||
XRUBY = @XRUBY@
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
|
|
|
@ -350,7 +350,7 @@ post-install-doc::
|
|||
|
||||
rdoc: $(PROGRAM) PHONY
|
||||
@echo Generating RDoc documentation
|
||||
$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
|
||||
$(XRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
|
||||
nodoc: PHONY
|
||||
|
||||
what-where-doc: no-install-doc
|
||||
|
|
|
@ -1979,18 +1979,21 @@ if test x"$cross_compiling" = xyes; then
|
|||
test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
|
||||
PREP='$(arch)-fake.rb'
|
||||
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
|
||||
XRUBY='$(MINIRUBY)'
|
||||
TEST_RUNNABLE=no
|
||||
else
|
||||
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
|
||||
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
|
||||
PREP='miniruby$(EXEEXT)'
|
||||
RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
|
||||
XRUBY='$(RUNRUBY)'
|
||||
TEST_RUNNABLE=yes
|
||||
fi
|
||||
AC_SUBST(TEST_RUNNABLE)
|
||||
AC_SUBST(MINIRUBY)
|
||||
AC_SUBST(PREP)
|
||||
AC_SUBST(RUNRUBY)
|
||||
AC_SUBST(XRUBY)
|
||||
AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
|
||||
|
||||
FIRSTMAKEFILE=""
|
||||
|
|
|
@ -254,6 +254,11 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)"
|
|||
!endif
|
||||
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
|
||||
RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) --
|
||||
!if $(CROSS_COMPILING)
|
||||
XRUBY = $(MINIRUBY)
|
||||
!else
|
||||
XRUBY = $(RUNRUBY)
|
||||
!endif
|
||||
!ifndef RUBY
|
||||
RUBY = ruby
|
||||
!endif
|
||||
|
|
Loading…
Add table
Reference in a new issue