1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* common.mk (showflags, help): emit messages at once.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-13 07:38:01 +00:00
parent c37066fab7
commit 223c0b48a1
4 changed files with 46 additions and 39 deletions

View file

@ -1,4 +1,6 @@
Sat Nov 13 16:26:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Nov 13 16:37:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (showflags, help): emit messages at once.
* win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I. * win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I.

View file

@ -142,8 +142,9 @@ INSTALLED_LIST= .installed.list
MKMAIN_CMD = mkmain.sh MKMAIN_CMD = mkmain.sh
SRC_FILE = $< SRC_FILE = $<
MSG = @echo "
EOM = " MESSAGE_BEGIN = @for line in
MESSAGE_END = ; do echo "$$line"; done
#### End of variables #### End of variables
all: all:

View file

@ -142,11 +142,13 @@ main: showflags encs exts
.PHONY: showflags .PHONY: showflags
exts enc trans: showflags exts enc trans: showflags
showflags: showflags:
$(MSG) CFLAGS = $(CFLAGS)$(EOM) $(MESSAGE_BEGIN) \
$(MSG) XCFLAGS = $(XCFLAGS)$(EOM) " CFLAGS = $(CFLAGS)" \
$(MSG) CPPFLAGS = $(CPPFLAGS)$(EOM) " XCFLAGS = $(XCFLAGS)" \
$(MSG) DLDFLAGS = $(DLDFLAGS)$(EOM) " CPPFLAGS = $(CPPFLAGS)" \
$(MSG) SOLIBS = $(SOLIBS)$(EOM) " DLDFLAGS = $(DLDFLAGS)" \
" SOLIBS = $(SOLIBS)" \
$(MESSAGE_END)
exts: $(MKMAIN_CMD) exts: $(MKMAIN_CMD)
@ -872,32 +874,34 @@ change: PHONY
$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log $(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
help: PHONY help: PHONY
$(MSG) Makefile of Ruby$(EOM) $(MESSAGE_BEGIN) \
$(MSG)$(EOM) " Makefile of Ruby" \
$(MSG)targets:$(EOM) "" \
$(MSG) all (default): builds all of below$(EOM) "targets:" \
$(MSG) miniruby: builds only miniruby$(EOM) " all (default): builds all of below" \
$(MSG) encs: builds encodings$(EOM) " miniruby: builds only miniruby" \
$(MSG) exts: builds extensions$(EOM) " encs: builds encodings" \
$(MSG) main: builds encodings, extensions and ruby$(EOM) " exts: builds extensions" \
$(MSG) docs: builds documents$(EOM) " main: builds encodings, extensions and ruby" \
$(MSG) run: runs test.rb by miniruby$(EOM) " docs: builds documents" \
$(MSG) runruby: runs test.rb by ruby you just built$(EOM) " run: runs test.rb by miniruby" \
$(MSG) gdb: runs test.rb by miniruby under gdb$(EOM) " runruby: runs test.rb by ruby you just built" \
$(MSG) gdb-ruby: runs test.rb by ruby under gdb$(EOM) " gdb: runs test.rb by miniruby under gdb" \
$(MSG) check: equals make test test-all$(EOM) " gdb-ruby: runs test.rb by ruby under gdb" \
$(MSG) test: ruby core tests$(EOM) " check: equals make test test-all" \
$(MSG) test-all: all ruby tests$(EOM) " test: ruby core tests" \
$(MSG) test-rubyspec run RubySpec test suite$(EOM) " test-all: all ruby tests" \
$(MSG) update-rubyspec update local copy of RubySpec$(EOM) " test-rubyspec: run RubySpec test suite" \
$(MSG) benchmark benchmark this ruby and COMPARE_RUBY$(EOM) " update-rubyspec: update local copy of RubySpec" \
$(MSG) install: install all ruby distributions$(EOM) " benchmark: benchmark this ruby and COMPARE_RUBY" \
$(MSG) install-nodoc: install without rdoc$(EOM) " install: install all ruby distributions" \
$(MSG) install-cross: install cross compiling staff$(EOM) " install-nodoc: install without rdoc" \
$(MSG) clean: clean for tarball$(EOM) " install-cross: install cross compiling staff" \
$(MSG) distclean: clean for repo$(EOM) " clean: clean for tarball" \
$(MSG) change: make change log template$(EOM) " distclean: clean for repo" \
$(MSG) golf: for golfers$(EOM) " change: make change log template" \
$(MSG)$(EOM) " golf: for golfers" \
$(MSG)see DeveloperHowto for more detail: $(EOM) "" \
$(MSG) http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto$(EOM) "see DeveloperHowto for more detail: " \
" http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto" \
$(MESSAGE_END)

View file

@ -341,8 +341,8 @@ VCSUP = $(VCS) pull $(GITPULLOPTIONS)
!endif !endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
MSG = @for %I in ("#" MESSAGE_BEGIN = @for %I in (
EOM = ") do @echo.%~I#" MESSAGE_END = ) do @echo.%~I
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk