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

* lib/mkmf.rb (create_makefile): use forward slashes in messages.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-17 14:17:26 +00:00
parent 49959bfd62
commit 4fc08fd17d
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Wed Nov 17 19:13:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Nov 17 23:17:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): use forward slashes in messages.
* lib/mkmf.rb (create_makefile): make extension libraries messages * lib/mkmf.rb (create_makefile): make extension libraries messages
brief. brief.

8
lib/mkmf.rb
View File

@ -1884,9 +1884,11 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
s = s.gsub(/(\$\(\w+)(\))/) {$1+sep+$2} s = s.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
s = s.gsub(/(\$\{\w+)(\})/) {$1+sep+$2} s = s.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
} }
rsep = ":#{fsep}=/"
else else
fseprepl = proc {|s| s} fseprepl = proc {|s| s}
sep = "" sep = ""
rsep = ""
end end
dirs = [] dirs = []
mfile.print "install: install-so install-rb\n\n" mfile.print "install: install-so install-rb\n\n"
@ -1964,7 +1966,7 @@ site-install-rb: install-rb
mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n" mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
mfile.print "\n" mfile.print "\n"
compile_command = "\n\t$(ECHO) compiling $<\n\t$(Q) %s\n\n" compile_command = "\n\t$(ECHO) compiling $(<#{rsep})\n\t$(Q) %s\n\n"
CXX_EXT.each do |e| CXX_EXT.each do |e|
COMPILE_RULES.each do |rule| COMPILE_RULES.each do |rule|
mfile.printf(rule, e, $OBJEXT) mfile.printf(rule, e, $OBJEXT)
@ -1998,7 +2000,7 @@ site-install-rb: install-rb
mfile.print link_so, "\n\n" mfile.print link_so, "\n\n"
unless $static.nil? unless $static.nil?
mfile.print "$(STATIC_LIB): $(OBJS)\n\t@-$(RM) $(@#{sep})\n\t" mfile.print "$(STATIC_LIB): $(OBJS)\n\t@-$(RM) $(@#{sep})\n\t"
mfile.print "$(ECHO) linking static-library $(@)\n\t$(Q) " mfile.print "$(ECHO) linking static-library $(@#{rsep})\n\t$(Q) "
mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)" mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
config_string('RANLIB') do |ranlib| config_string('RANLIB') do |ranlib|
mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true" mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
@ -2007,7 +2009,7 @@ site-install-rb: install-rb
mfile.print "\n\n" mfile.print "\n\n"
if makedef if makedef
mfile.print "$(DEFFILE): #{origdef}\n" mfile.print "$(DEFFILE): #{origdef}\n"
mfile.print "\t$(ECHO) generating $@\n" mfile.print "\t$(ECHO) generating $(@#{rsep})\n"
mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n" mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n"
end end

14
win32/Makefile.sub
View File

@ -785,7 +785,7 @@ miniruby: miniruby$(EXEEXT)
miniruby$(EXEEXT): miniruby$(EXEEXT):
@echo $(LIBS) @echo $(LIBS)
$(ECHO) linking $@ $(ECHO) linking $(@:\=/)
$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS) $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
@$(RM) miniruby.lib miniruby.exp @$(RM) miniruby.lib miniruby.exp
$(Q) miniruby.exe -v $(Q) miniruby.exe -v
@ -797,7 +797,7 @@ miniruby.rc:
!if "$(PROGRAM)" != "" !if "$(PROGRAM)" != ""
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(ECHO) linking $@ $(ECHO) linking $(@:\=/)
$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \ $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
$(Q) $(LDSHARED_0) $(Q) $(LDSHARED_0)
@ -807,7 +807,7 @@ $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
!if "$(WPROGRAM)" != "" !if "$(WPROGRAM)" != ""
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
$(ECHO) linking $@ $(ECHO) linking $(@:\=/)
$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \ $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \ $(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
-link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows -link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
@ -817,17 +817,17 @@ $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
!endif !endif
$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(LIBRUBY_A): $(OBJS) $(DMYEXT)
$(ECHO) linking static-library $@ $(ECHO) linking static-library $(@:\=/)
$(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT) $(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
$(LIBRUBY): $(RUBYDEF) $(LIBRUBY): $(RUBYDEF)
$(ECHO) linking import-library $@ $(ECHO) linking import-library $(@:\=/)
$(Q) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF) $(Q) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(DLDOBJS) @echo $(DLDOBJS)
@-$(PRE_LIBRUBY_UPDATE) @-$(PRE_LIBRUBY_UPDATE)
$(ECHO) linking shared-library $@ $(ECHO) linking shared-library $(@:\=/)
$(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ $(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
$(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \ $(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \
$(LIBRUBY_DLDFLAGS) $(LIBRUBY_DLDFLAGS)
@ -837,7 +837,7 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
$(Q) $(LDSHARED_2) $(Q) $(LDSHARED_2)
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(ECHO) generating $@ $(ECHO) generating $(@:\=/)
$(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb \ $(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb \
-output=$@ -arch=$(ARCH) $(LIBRUBY_A) -output=$@ -arch=$(ARCH) $(LIBRUBY_A)