Skip to content

Commit

Permalink
* common.mk (showflags, help): emit messages at once.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Nov 13, 2010
1 parent c37066f commit 223c0b4
Showing 4 changed files with 46 additions and 39 deletions.
4 changes: 3 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Sat Nov 13 16:26:11 2010 Nobuyoshi Nakada <[email protected]>
Sat Nov 13 16:37:56 2010 Nobuyoshi Nakada <[email protected]>

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

* win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I.

5 changes: 3 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -142,8 +142,9 @@ INSTALLED_LIST= .installed.list
MKMAIN_CMD = mkmain.sh

SRC_FILE = $<
MSG = @echo "
EOM = "

MESSAGE_BEGIN = @for line in
MESSAGE_END = ; do echo "$$line"; done
#### End of variables

all:
72 changes: 38 additions & 34 deletions common.mk
Original file line number Diff line number Diff line change
@@ -142,11 +142,13 @@ main: showflags encs exts
.PHONY: showflags
exts enc trans: showflags
showflags:
$(MSG) CFLAGS = $(CFLAGS)$(EOM)
$(MSG) XCFLAGS = $(XCFLAGS)$(EOM)
$(MSG) CPPFLAGS = $(CPPFLAGS)$(EOM)
$(MSG) DLDFLAGS = $(DLDFLAGS)$(EOM)
$(MSG) SOLIBS = $(SOLIBS)$(EOM)
$(MESSAGE_BEGIN) \
" CFLAGS = $(CFLAGS)" \
" XCFLAGS = $(XCFLAGS)" \
" CPPFLAGS = $(CPPFLAGS)" \
" DLDFLAGS = $(DLDFLAGS)" \
" SOLIBS = $(SOLIBS)" \
$(MESSAGE_END)

exts: $(MKMAIN_CMD)

@@ -872,32 +874,34 @@ change: PHONY
$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log

help: PHONY
$(MSG) Makefile of Ruby$(EOM)
$(MSG)$(EOM)
$(MSG)targets:$(EOM)
$(MSG) all (default): builds all of below$(EOM)
$(MSG) miniruby: builds only miniruby$(EOM)
$(MSG) encs: builds encodings$(EOM)
$(MSG) exts: builds extensions$(EOM)
$(MSG) main: builds encodings, extensions and ruby$(EOM)
$(MSG) docs: builds documents$(EOM)
$(MSG) run: runs test.rb by miniruby$(EOM)
$(MSG) runruby: runs test.rb by ruby you just built$(EOM)
$(MSG) gdb: runs test.rb by miniruby under gdb$(EOM)
$(MSG) gdb-ruby: runs test.rb by ruby under gdb$(EOM)
$(MSG) check: equals make test test-all$(EOM)
$(MSG) test: ruby core tests$(EOM)
$(MSG) test-all: all ruby tests$(EOM)
$(MSG) test-rubyspec run RubySpec test suite$(EOM)
$(MSG) update-rubyspec update local copy of RubySpec$(EOM)
$(MSG) benchmark benchmark this ruby and COMPARE_RUBY$(EOM)
$(MSG) install: install all ruby distributions$(EOM)
$(MSG) install-nodoc: install without rdoc$(EOM)
$(MSG) install-cross: install cross compiling staff$(EOM)
$(MSG) clean: clean for tarball$(EOM)
$(MSG) distclean: clean for repo$(EOM)
$(MSG) change: make change log template$(EOM)
$(MSG) golf: for golfers$(EOM)
$(MSG)$(EOM)
$(MSG)see DeveloperHowto for more detail: $(EOM)
$(MSG) http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto$(EOM)
$(MESSAGE_BEGIN) \
" Makefile of Ruby" \
"" \
"targets:" \
" all (default): builds all of below" \
" miniruby: builds only miniruby" \
" encs: builds encodings" \
" exts: builds extensions" \
" main: builds encodings, extensions and ruby" \
" docs: builds documents" \
" run: runs test.rb by miniruby" \
" runruby: runs test.rb by ruby you just built" \
" gdb: runs test.rb by miniruby under gdb" \
" gdb-ruby: runs test.rb by ruby under gdb" \
" check: equals make test test-all" \
" test: ruby core tests" \
" test-all: all ruby tests" \
" test-rubyspec: run RubySpec test suite" \
" update-rubyspec: update local copy of RubySpec" \
" benchmark: benchmark this ruby and COMPARE_RUBY" \
" install: install all ruby distributions" \
" install-nodoc: install without rdoc" \
" install-cross: install cross compiling staff" \
" clean: clean for tarball" \
" distclean: clean for repo" \
" change: make change log template" \
" golf: for golfers" \
"" \
"see DeveloperHowto for more detail: " \
" http://redmine.ruby-lang.org/wiki/ruby/DeveloperHowto" \
$(MESSAGE_END)
4 changes: 2 additions & 2 deletions win32/Makefile.sub
Original file line number Diff line number Diff line change
@@ -341,8 +341,8 @@ VCSUP = $(VCS) pull $(GITPULLOPTIONS)
!endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc

MSG = @for %I in ("#"
EOM = ") do @echo.%~I#"
MESSAGE_BEGIN = @for %I in (
MESSAGE_END = ) do @echo.%~I

all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk

0 comments on commit 223c0b4

Please sign in to comment.