archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r20587 from trunk into ruby_1_9_1.

Browse source 
* mkconfig.rb: fix for continued lines.  based on a patch from
  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-12 14:54:37 +00:00
parent 17e1400805
commit 6ecdf87bdb
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Dec 9 03:21:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb: fix for continued lines. based on a patch from
Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
Fri Dec 5 22:56:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Dec 5 22:56:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_make_exception): single argument to raise may be * eval.c (rb_make_exception): single argument to raise may be

11
mkconfig.rb
View file

@ -56,14 +56,13 @@ File.foreach "config.status" do |line|
continued_name = name continued_name = name
next next
end end
when /^"(.+)"\s*(\\)?$/ when /^"(.*)"\s*(\\)?$/
if continued_line if continued_line
continued_line << $1 continued_line << $1
unless $2 next if $2
val = continued_line.join("") val = continued_line.join("")
name = continued_name name = continued_name
continued_line = nil continued_line = nil
end
end end
when /^(?:ac_given_)?INSTALL=(.*)/ when /^(?:ac_given_)?INSTALL=(.*)/
v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n"