1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in, common.mk, */configure.bat (rdoc): make before

Browse Source 
install if rdoc is enabled.  [ruby-dev:39325]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-09-14 02:23:47 +00:00
parent d937bbe9ce
commit 3ab03a234d
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Sep 14 11:23:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, common.mk, */configure.bat (rdoc): make before
install if rdoc is enabled. [ruby-dev:39325]
Mon Sep 14 10:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Sep 14 10:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (check-ruby): run all test of ruby itself. * common.mk (check-ruby): run all test of ruby itself.

5
common.mk
View File

@ -124,7 +124,7 @@ BOOTSTRAPRUBY = $(BASERUBY)
COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -rrbconfig $(srcdir)/tool/compile_prelude.rb COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -rrbconfig $(srcdir)/tool/compile_prelude.rb
all: encs exts main all: encs exts main $(RDOCTARGET)
main: exts main: exts
@$(RUNCMD) $(MKMAIN_CMD) $(MAKE) @$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
@ -172,7 +172,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
ruby.imp: $(EXPORTOBJS) ruby.imp: $(EXPORTOBJS)
@$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ @$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-nodoc $(RDOCTARGET) install: install-nodoc install-$(RDOCTARGET)
install-all: install-nodoc install-doc install-capi install-all: install-nodoc install-doc install-capi
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
@ -337,6 +337,7 @@ post-install-doc::
rdoc: $(PROGRAM) PHONY rdoc: $(PROGRAM) PHONY
@echo Generating RDoc documentation @echo Generating RDoc documentation
$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)" $(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
nodoc: PHONY
what-where-doc: no-install-doc what-where-doc: no-install-doc
no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc

4
configure.in
View File

@ -2120,7 +2120,9 @@ AC_ARG_ENABLE(install-doc,
AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]), AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
[install_doc=$enableval], [install_doc=yes]) [install_doc=$enableval], [install_doc=yes])
if test "$install_doc" != no; then if test "$install_doc" != no; then
RDOCTARGET="install-doc" RDOCTARGET="rdoc"
else
RDOCTARGET="nodoc"
fi fi
AC_SUBST(RDOCTARGET) AC_SUBST(RDOCTARGET)

4
win32/configure.bat
View File

@ -88,12 +88,12 @@ goto :loop
shift shift
goto :loop goto :loop
:enable-rdoc :enable-rdoc
echo>> ~tmp~.mak "RDOCTARGET=install-doc" \ echo>> ~tmp~.mak "RDOCTARGET=rdoc" \
echo>>confargs.tmp %1 \ echo>>confargs.tmp %1 \
shift shift
goto :loop goto :loop
:disable-rdoc :disable-rdoc
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \ echo>> ~tmp~.mak "RDOCTARGET=nodoc" \
echo>>confargs.tmp %1 \ echo>>confargs.tmp %1 \
shift shift
goto :loop goto :loop