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

* win32/Makefile.sub (clean-enc): pass V to inferior make.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-12-29 11:27:36 +00:00
parent 055e4558bd
commit 0dfd81cb23
4 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Dec 29 20:27:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (clean-enc): pass V to inferior make.
Wed Dec 29 18:23:46 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Dec 29 18:23:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* re.c (rb_reg_expr_str): need to escape if the coderange is invalid. * re.c (rb_reg_expr_str): need to escape if the coderange is invalid.

4
enc/Makefile.in
View file

@ -63,10 +63,10 @@ MAKEDIRS = @MAKEDIRS@
all: make-workdir all: make-workdir
make-workdir: make-workdir:
$(Q) $(MAKEDIRS) $(WORKDIRS) $(Q)$(MAKEDIRS) $(WORKDIRS)
clean: clean:
distclean: clean distclean: clean
@$(RM) enc.mk $(Q)$(RM) enc.mk
realclean: distclean clean-srcs realclean: distclean clean-srcs

28
enc/depend
View file

@ -83,7 +83,7 @@ srcs: $(TRANSCSRCS)
<%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c: <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
$(ECHO) generating table from $@ $(ECHO) generating table from $@
$(Q) $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<" $(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
% unless encs.empty? or trans.empty? % unless encs.empty? or trans.empty?
@ -120,20 +120,20 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
% base = File.basename(e) % base = File.basename(e)
% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags % cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
% if df % if df
$(Q) echo> <%=df%> EXPORTS $(Q)echo> <%=df%> EXPORTS
$(Q) echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> $(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
% cmd.sub!(/\$\(DEFFILE\)/) {df} % cmd.sub!(/\$\(DEFFILE\)/) {df}
% cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"} % cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
% end % end
$(Q) $(MAKEDIRS) "$(@D)" $(Q)$(MAKEDIRS) "$(@D)"
$(Q) <%=cmd%> $(Q)<%=cmd%>
% end % end
% dependencies.each do |e| % dependencies.each do |e|
<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%> <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
-$(Q) $(MAKEDIRS) "$(@D)" -$(Q)$(MAKEDIRS) "$(@D)"
$(ECHO) compiling <%= "#{e}.c"%> $(ECHO) compiling <%= "#{e}.c"%>
$(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%> $(Q)<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
% end % end
@ -142,16 +142,16 @@ enc/trans/transdb.$(OBJEXT): transdb.h
clean: clean:
% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean| % %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
@$(RM) <%=pathrep[clean]%> $(Q)$(RM) <%=pathrep[clean]%>
% end % end
% @ignore_error = $nmake ? '' : ' 2> /dev/null || true' % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
% workdirs.reverse_each do|dir| % workdirs.reverse_each do|dir|
@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%> -$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
% end % end
clean-srcs: clean-srcs:
@$(RM) <%=pathrep['$(TRANSCSRCS)']%> $(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
@-$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%> -$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
@$(RM) enc/unicode/name2ctype.h $(Q)$(RM) enc/unicode/name2ctype.h
@-$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%> -$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
@-$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%> -$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>

2
win32/Makefile.sub
View file

@ -930,7 +930,7 @@ clean-extout:
clean-enc distclean-enc realclean-enc: clean-enc distclean-enc realclean-enc:
!if exist($(ENC_MK)) !if exist($(ENC_MK))
@echo $(@:-enc=ing) encodings @echo $(@:-enc=ing) encodings
@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=) @-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=)
!endif !endif
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb