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

*** empty log message ***

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-01-12 03:19:57 +00:00
parent 16b7b1fb95
commit 6132ed31fb
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,6 +1,6 @@
Mon Jan 12 12:07:22 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
Someone changed the "// in eval.c" comments to "/*...*/" style,
so the parsing of the source file name broke.
@ -12,7 +12,7 @@ Mon Jan 12 12:07:22 2004 Dave Thomas <dave@pragprog.com>
and all intervening code was included in the following
method's documentation.
* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
HTML formats need explicit line breaks.
Mon Jan 12 11:46:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>

2
ext/extmk.rb
View file

@ -109,7 +109,7 @@ def extmake(target)
$extpath ||= []
$extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
$extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
$extlibs |= $libs.split | $LOCAL_LIBS.split
$extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
$extpath |= $LIBPATH
end
ensure

15
lib/mkmf.rb
View file

@ -113,6 +113,21 @@ def modified?(target, times)
t if times.all? {|n| n <= t}
end
def merge_libs(*libs)
libs.inject([]) do |x, y|
xy = x & y
xn = yn = 0
y.each_with_index do |v, yi|
if xy.include?(v)
xi = [x.index(v), xn].max()
x[xi, 1] = y[yn..yi]
xn, yn = xi + (yi - yn + 1), yi + 1
end
end
x.concat(y[yn..-1] || [])
end
end
module Logging
@log = nil
@logfile = 'mkmf.log'