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

* enc/depend: add space at the begginig of @ignore_error.

Browse Source 
* lib/mkmf.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-08-06 08:44:33 +00:00
parent f3372c22a6
commit 775188a0a2
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Aug 6 17:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
* enc/depend: add space at the begginig of @ignore_error.
* lib/mkmf.rb: ditto.
Fri Aug 6 17:38:33 2010 NARUSE, Yui <naruse@ruby-lang.org> Fri Aug 6 17:38:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
* common.mk (clean): add prelude.c, config.log, and rbconfig.rb. * common.mk (clean): add prelude.c, config.log, and rbconfig.rb.

2
enc/depend
View File

@ -132,7 +132,7 @@ 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]%> @$(RM) <%=pathrep[clean]%>
% end % end
% @ignore_error = $nmake ? '' : '2> /dev/null || true' % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir| % %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%> @-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
% end % end

2
lib/mkmf.rb
View File

@ -1813,7 +1813,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
mfile.print "install: install-so install-rb\n\n" mfile.print "install: install-so install-rb\n\n"
sodir = (dir = "$(RUBYARCHDIR)").dup sodir = (dir = "$(RUBYARCHDIR)").dup
mfile.print("install-so: ") mfile.print("install-so: ")
@ignore_error = $nmake ? '' : '2> /dev/null || true' @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
if target if target
f = "$(DLLIB)" f = "$(DLLIB)"
dest = "#{dir}/#{f}" dest = "#{dir}/#{f}"