mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a7de375504
commit
023eab5201
6 changed files with 16 additions and 12 deletions
|
@ -1,4 +1,6 @@
|
|||
Wed Nov 17 18:22:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Wed Nov 17 18:38:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
|
||||
|
||||
* common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass
|
||||
Q and ECHO. [ruby-core:33226]
|
||||
|
|
|
@ -169,7 +169,7 @@ golf: $(LIBRUBY) $(GOLFOBJS) PHONY
|
|||
$(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
|
||||
capi: $(CAPIOUT)/.timestamp PHONY
|
||||
doc/capi/.timestamp: Doxyfile $(PREP)
|
||||
@$(MAKEDIRS) doc/capi
|
||||
$(Q) $(MAKEDIRS) doc/capi
|
||||
$(ECHO) generating capi
|
||||
$(Q) $(DOXYGEN) -b
|
||||
$(Q) $(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}'
|
||||
|
@ -467,7 +467,7 @@ yes-test-ruby: PHONY
|
|||
$(RUNRUBY) "$(srcdir)/test/runner.rb" ruby
|
||||
|
||||
extconf: $(PREP)
|
||||
$(MAKEDIRS) "$(EXTCONFDIR)"
|
||||
$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
|
||||
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
|
||||
|
||||
$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
|
||||
|
@ -712,7 +712,7 @@ utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
|
|||
{$(VPATH)}defines.h {$(VPATH)}oniguruma.h
|
||||
|
||||
newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
|
||||
$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
|
||||
$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
|
||||
newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
|
||||
{$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
|
||||
{$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h
|
||||
|
|
|
@ -63,7 +63,7 @@ MAKEDIRS = @MAKEDIRS@
|
|||
all: make-workdir
|
||||
|
||||
make-workdir:
|
||||
$(MAKEDIRS) $(WORKDIRS)
|
||||
$(Q) $(MAKEDIRS) $(WORKDIRS)
|
||||
|
||||
clean:
|
||||
|
||||
|
|
|
@ -123,13 +123,13 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
|
|||
% cmd.sub!(/\$\(DEFFILE\)/) {df}
|
||||
% cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
|
||||
% end
|
||||
@$(MAKEDIRS) "$(@D)"
|
||||
$(Q) $(MAKEDIRS) "$(@D)"
|
||||
$(Q) <%=cmd%>
|
||||
|
||||
% end
|
||||
% dependencies.each do |e|
|
||||
<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
|
||||
-@$(MAKEDIRS) "$(@D)"
|
||||
-$(Q) $(MAKEDIRS) "$(@D)"
|
||||
$(ECHO) compiling <%= "#{e}.c"%>
|
||||
$(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ if $".grep(/mkmf/).empty?
|
|||
end
|
||||
require 'erb'
|
||||
|
||||
CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
|
||||
CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p'
|
||||
|
||||
BUILTIN_ENCS = []
|
||||
BUILTIN_TRANSES = []
|
||||
|
|
|
@ -268,7 +268,7 @@ XRUBY = $(RUNRUBY)
|
|||
!ifndef RUBY
|
||||
RUBY = ruby
|
||||
!endif
|
||||
MAKEDIRS = @$(MINIRUBY) -run -e mkdir -- -p
|
||||
MAKEDIRS = $(MINIRUBY) -run -e mkdir -- -p
|
||||
|
||||
!if !defined(STACK)
|
||||
!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
|
||||
|
@ -837,11 +837,12 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
|
|||
$(Q) $(LDSHARED_2)
|
||||
|
||||
$(RUBYDEF): $(LIBRUBY_A) $(PREP)
|
||||
$(MINIRUBY) $(srcdir)/win32/mkexports.rb \
|
||||
$(ECHO) generating $@
|
||||
$(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb \
|
||||
-output=$@ -arch=$(ARCH) $(LIBRUBY_A)
|
||||
|
||||
{$(win_srcdir)}.def.lib:
|
||||
$(AR) $(ARFLAGS)$@ -def:$<
|
||||
$(Q) $(AR) $(ARFLAGS)$@ -def:$<
|
||||
|
||||
clean-local::
|
||||
@$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
|
||||
|
@ -974,7 +975,8 @@ lex.c: {$(srcdir)}lex.c.blt
|
|||
|
||||
enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt
|
||||
@if not exist $(@D:/=\) md $(@D:/=\)
|
||||
copy $(?:/=\) $(@:/=\)
|
||||
$(ECHO) copying $@
|
||||
$(Q) copy $(?:/=\) $(@:/=\) > nul
|
||||
|
||||
$(OBJS): {$(hdrdir)/ruby}win32.h
|
||||
|
||||
|
|
Loading…
Reference in a new issue