8000 merge revision(s) 11594: · documenting-ruby/ruby@e3fb469 · GitHub
[go: up one dir, main page]
Skip to content

Commit e3fb469

Browse files
shyouheishyouhei
committed
merge revision(s) 11594:
 * mkconfig.rb: autoconf 2.61 support. [ruby-core:10016] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent b433f16 commit e3fb469

File tree

3 files changed

+37
-6
lines changed

3 files changed

+37
-6
lines changed

‎ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Mon Jun 16 17:11:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
2+
3+
* mkconfig.rb: autoconf 2.61 support. [ruby-core:10016]
4+
15
Mon Jun 16 15:40:37 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
26

37
* proc.c (proc_dup): should copy safe_level from src proc

‎mkconfig.rb

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,39 @@ module Config
3636
v_others = []
3737
vars = {}
3838
has_version = false
39+
continued_name = nil
40+
continued_line = nil
3941
File.foreach "config.status" do |line|
4042
next if /^#/ =~ line
41-
if /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/ =~ line
43+
name = nil
44+
case line
45+
when /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/
4246
name = $2
4347
val = $3.gsub(/\\(?=,)/, '')
44-
next if /^(?:ac_.*|DEFS|configure_input)$/ =~ name
48+
when /^S\["(\w+)"\]\s*=\s*"(.*)"\s*(\\)?$/
49+
name = $1
50+
val = $2
51+
if $3
52+
continued_line = []
53+
continued_line << val
54+
continued_name = name
55+
next
56+
end
57+
when /^"(.+)"\s*(\\)?$/
58+
if continued_line
59+
continued_line << $1
60+
unless $2
61+
val = continued_line.join("")
62+
name = continued_name
63+
continued_line = nil
64+
end
65+
end
66+
when /^(?:ac_given_)?INSTALL=(.*)/
67+
v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n"
68+
end
69+
70+
if name
71+
next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
4572
next if /^\$\(ac_\w+\)$/ =~ val
4673
next if /^\$\{ac_\w+\}$/ =~ val
4774< 8000 /code>
next if /^\$ac_\w+$/ =~ val
@@ -54,6 +81,7 @@ module Config
5481
name = "ruby_install_name"
5582
val = "ruby".sub(/#{ptn[0]}/, ptn[1])
5683
end
84+
val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM
5785
val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
5886
if /^prefix$/ =~ name
5987
val = "(TOPDIR || DESTDIR + #{val})"
@@ -66,8 +94,6 @@ module Config
6694
v_others << v
6795
end
6896
has_version = true if name == "MAJOR"
69-
elsif /^(?:ac_given_)?INSTALL=(.*)/ =~ line
70-
v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n"
7197
end
7298
# break if /^CEOF/
7399
end
@@ -109,7 +135,8 @@ module Config
109135
v_fast << " CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
110136
end
111137

112-
print v_fast, v_others
138+
print(*v_fast)
139+
print(*v_others)
113140
print <<EOS
114141
CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
115142
CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define RUBY_RELEASE_DATE "2008-06-16"
33
#define RUBY_VERSION_CODE 185
44
#define RUBY_RELEASE_CODE 20080616
5-
#define RUBY_PATCHLEVEL 221
5+
#define RUBY_PATCHLEVEL 222
66

77
#define RUBY_VERSION_MAJOR 1
88
#define RUBY_VERSION_MINOR 8

0 commit comments

Comments
 (0)
0