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

* enc/depend: fix typo.

Browse Source 
* lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
	  with "\\".



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-02-13 02:21:25 +00:00
parent bcd4deb6c5
commit f6628871b5
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Feb 13 11:20:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* enc/depend: fix typo.
* lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
with "\\".
Wed Feb 13 08:57:21 2008 Eric Hodel <drbrain@segment7.net> Wed Feb 13 08:57:21 2008 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/markup/inline.rb: Allow inline markup to have a leading * lib/rdoc/markup/inline.rb: Allow inline markup to have a leading

2
enc/depend
View File

@ -46,7 +46,7 @@ $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
echo EXPORTS > <%=df%> echo EXPORTS > <%=df%>
echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%> echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%>
% end % end
<%=link_so.sub(/\$\(OBJS\)/, obj).sub(/\$\(DEFFILE\)/, df.to_s).gsub(/-(?:implib|pdb):/, "\\1enc/#{e.sub(/[^\/]+\z/, '')}")%> <%=link_so.sub(/\$\(OBJS\)/, obj).sub(/\$\(DEFFILE\)/, df.to_s).gsub(/-(?:implib|pdb):/, "\\&enc/#{e.sub(/[^\/]+\z/, '')}")%>
% end % end
% dependencies.each do |e| % dependencies.each do |e|

12
lib/mkmf.rb
View File

@ -1512,10 +1512,10 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
f.gsub!("/", sep) f.gsub!("/", sep)
dir.gsub!("/", sep) dir.gsub!("/", sep)
sep = ":/="+sep sep = ":/="+sep
f.gsub!(/(\$\(\w+)(\))/, "\\1#{sep}\\2") f.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
f.gsub!(/(\$\{\w+)(\})/, "\\1#{sep}\\2") f.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
dir.gsub!(/(\$\(\w+)(\))/, "\\1#{sep}\\2") dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
dir.gsub!(/(\$\{\w+)(\})/, "\\1#{sep}\\2") dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
end end
mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n" mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
if defined?($installed_list) if defined?($installed_list)
@ -1546,8 +1546,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
if sep if sep
f = f.gsub("/", sep) f = f.gsub("/", sep)
sep = ":/="+sep sep = ":/="+sep
f = f.gsub(/(\$\(\w+)(\))/, "\\1#{sep}\\2") f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
f = f.gsub(/(\$\{\w+)(\})/, "\\1#{sep}\\2") f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
else else
sep = "" sep = ""
end end