diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/iconv/charset_alias.rb | 46 | ||||
-rw-r--r-- | ext/iconv/extconf.rb | 4 |
3 files changed, 41 insertions, 13 deletions
@@ -1,8 +1,10 @@ -Sat Oct 8 18:56:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Oct 8 19:15:02 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on heap. [ruby-list:41199] + * ext/iconv/charset_alias.rb: parse config.charset_alias file directly. + Fri Oct 7 09:54:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb index 65fd41759b..e5210b4e4f 100644 --- a/ext/iconv/charset_alias.rb +++ b/ext/iconv/charset_alias.rb @@ -1,11 +1,12 @@ #! /usr/bin/ruby # :stopdoc: require 'rbconfig' +require 'optparse' # http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset # Fri, 30 May 2003 00:09:00 GMT' -OS = Config::CONFIG["target"] +OS = Config::CONFIG["target_os"] SHELL = Config::CONFIG['SHELL'] class Hash::Ordered < Hash @@ -24,12 +25,26 @@ end def charset_alias(config_charset, mapfile, target = OS) map = Hash::Ordered.new comments = [] - IO.foreach("|#{SHELL} #{config_charset} #{target}") do |list| - next comments << list if /^\#/ =~ list - next unless /^(\S+)\s+(\S+)$/ =~ list - sys, can = $1, $2 - can.downcase! - map[can] = sys + match = false + open(config_charset) do |input| + input.find {|line| /^case "\$os" in/ =~ line} or return + input.find {|line| + /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and + $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)} + } or return + input.find do |line| + case line + when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/ + sys, can = $1, $2 + can.downcase! + map[can] = sys + false + when /^\s*;;/ + true + else + false + end + end end case target when /linux|-gnu/ @@ -38,7 +53,7 @@ def charset_alias(config_charset, mapfile, target = OS) # get rid of tilde/yen problem. map['shift_jis'] = 'cp932' end - open(mapfile, "w") do |f| + writer = proc do |f| f.puts("require 'iconv.so'") f.puts f.puts(comments) @@ -46,7 +61,18 @@ def charset_alias(config_charset, mapfile, target = OS) map.each {|can, sys| f.puts(" charset_map['#{can}'.freeze] = '#{sys}'.freeze")} f.puts("end") end + if mapfile + open(mapfile, "w", &writer) + else + writer[STDOUT] + end end -(2..3) === ARGV.size or abort "usage: #$0 config.status map.rb [target]" -charset_alias(*ARGV) +target = OS +opt = nil +ARGV.options do |opt| + opt.banner << " config.status map.rb" + opt.on("--target OS") {|t| target = t} + opt.parse! and (1..2) === ARGV.size +end or abort opt.to_s +charset_alias(ARGV[0], ARGV[1], target) diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb index 62adb7a6b6..2d6f8538d7 100644 --- a/ext/iconv/extconf.rb +++ b/ext/iconv/extconf.rb @@ -32,7 +32,7 @@ if have_func("iconv", "iconv.h") or require 'uri' scheme = URI.parse(conf).scheme else - conf = prefix + "config.charset" + conf = "$(srcdir)/config.charset" end $cleanfiles << wrapper end @@ -41,7 +41,7 @@ if have_func("iconv", "iconv.h") or open("Makefile", "a") do |mf| mf.print("\nall: #{wrapper}\n\n#{wrapper}: #{prefix}charset_alias.rb") mf.print(" ", conf) unless scheme - mf.print("\n\t$(RUBY) ", prefix, "charset_alias.rb ", conf, " $@\n") + mf.print("\n\t$(RUBY) $(srcdir)/charset_alias.rb #{conf} $@\n") end end end |