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, 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/branches/ruby_1_8@24923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-09-14 02:23:47 +00:00
parent 02ea2f351c
commit c206448c40
6 changed files with 17 additions and 9 deletions
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 11:10:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Sep 14 11:10:06 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.

4
bcc32/configure.bat
View file

@ -87,14 +87,14 @@ goto :loop
goto :loop goto :loop
:enable-rdoc :enable-rdoc
echo>>confargs.mk !ifndef RDOCTARGET echo>>confargs.mk !ifndef RDOCTARGET
echo>>confargs.mk RDOCTARGET = install-doc echo>>confargs.mk RDOCTARGET = rdoc
echo>>confargs.mk !endif echo>>confargs.mk !endif
echo>>confargs.tmp %1 \ echo>>confargs.tmp %1 \
shift shift
goto :loop goto :loop
:disable-rdoc :disable-rdoc
echo>>confargs.mk !ifndef RDOCTARGET echo>>confargs.mk !ifndef RDOCTARGET
echo>>confargs.mk RDOCTARGET = install-nodoc echo>>confargs.mk RDOCTARGET = nodoc
echo>>confargs.mk !endif echo>>confargs.mk !endif
echo>>confargs.tmp %1 \ echo>>confargs.tmp %1 \
shift shift

5
common.mk
View file

@ -81,7 +81,7 @@ TESTWORKDIR = testwork
VCS = svn VCS = svn
all: main all: main $(RDOCTARGET)
main: exts main: exts
@$(RUNCMD) $(MKMAIN_CMD) $(MAKE) @$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
@ -111,7 +111,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
ruby.imp: $(OBJS) ruby.imp: $(OBJS)
@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ @$(NM) -Pgp $(OBJS) | 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-all: install-nodoc install-doc
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
@ -272,6 +272,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

@ -1608,7 +1608,9 @@ AC_ARG_ENABLE(install-doc,
AS_HELP_STRING([--enable-install-doc], [build and install rdoc indexes during install ]), AS_HELP_STRING([--enable-install-doc], [build and install rdoc indexes during install ]),
[install_doc=$enableval], [install_doc=no]) [install_doc=$enableval], [install_doc=no])
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

@ -68,11 +68,11 @@ goto :loop
shift shift
goto :loop goto :loop
:enable-rdoc :enable-rdoc
echo>> ~tmp~.mak "RDOCTARGET=install-doc" \ echo>> ~tmp~.mak "RDOCTARGET=rdoc" \
shift shift
goto :loop goto :loop
:disable-rdoc :disable-rdoc
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \ echo>> ~tmp~.mak "RDOCTARGET=nodoc" \
shift shift
goto :loop goto :loop
:extout :extout

4
wince/configure.bat
View file

@ -71,11 +71,11 @@ goto :loop
shift shift
goto :loop goto :loop
:enable-rdoc :enable-rdoc
echo>> ~tmp~.mak "RDOCTARGET=install-doc" \ echo>> ~tmp~.mak "RDOCTARGET=rdoc" \
shift shift
goto :loop goto :loop
:disable-rdoc :disable-rdoc
echo>> ~tmp~.mak "RDOCTARGET=install-nodoc" \ echo>> ~tmp~.mak "RDOCTARGET=nodoc" \
shift shift
goto :loop goto :loop
:extout :extout